Skip to content

Instantly share code, notes, and snippets.

Last active August 29, 2015 14:00
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
Star You must be signed in to star a gist
What would you like to do?
The non-personal bits of my git config
diff = auto
status = auto
branch = auto
browser = open
keepBackup = false
tool = diffmerge
defaultToUpstream = true
c = commit
ca = commit -a
caa = commit -a --amend -CHEAD
d = diff
dc = diff --cached
dw = diff --cached
dcw = diff --word-diff --cached
dwc = diff --word-diff --cached
a = add
aa = add -A
l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cd) %C(bold blue)<%an>%Creset' --abbrev-commit
s = status -bs
co = checkout
b = branch
sb = show-branch
mt = mergetool
m = merge
rb = rebase
cp = cherry-pick
unstage = reset head
ff = merge --ff-only
vim = !vim .git/index
wc = whatchanged -p --abbrev-commit --pretty=medium
n = checkout `git log HEAD..master --pretty=%h |tail -1`
excludesfile = /Users/kerry/.gitignore
editor = /Applications/
default = current
[mergetool "diffmerge"]
trustexitcode = true
cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
[mergetool "vimdiff3"]
cmd = mvim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
[mergetool "threesome"]
cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
trustExitCode = true
autosetuprebase = always
autocorrect = 1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment