Skip to content

Instantly share code, notes, and snippets.

@cawka
Created November 20, 2018 20:06
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save cawka/b0adf5619e13eeed132ead8447259a88 to your computer and use it in GitHub Desktop.
Save cawka/b0adf5619e13eeed132ead8447259a88 to your computer and use it in GitHub Desktop.
[alias]
d = diff
dw = diff --color-words
lc = log ORIG_HEAD.. --stat --no-merges
undo=reset --hard
all = submodule foreach
sub = submodule
s = status
l = log
g = log --graph --oneline
glog = log --graph
patch = !git --no-pager diff --no-color
[merge]
tool = opendiff
# tool = opendiff #p4merge #diffmerge
[mergetool]
keepBackup = false
[diff]
tool = opendiff
color-words = true
[difftool]
prompt = false
trustExitCode = false
[color]
diff = auto
status = auto
branch = auto
ui = true
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = 227
frag = magenta bold
commit = 227 bold
old = red bold
new = green bold
whitespace = red reverse
[credential]
helper = osxkeychain
[push]
default = simple
[rerere]
enabled = true
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
[clangFormat]
binary = /usr/local/bin/clang-format-hacked
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment