The non-personal bits of my git config

.gitconfig

[color]
  diff = auto
  status = auto
  branch = auto
[instaweb]
  browser = open
[merge]
  keepBackup = false
  tool = diffmerge
  defaultToUpstream = true
[alias]
  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`
[core]
  excludesfile = /Users/kerry/.gitignore
  editor = /Applications/MacVim.app/Contents/MacOS/Vim
[push]
  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
[branch]
  autosetuprebase = always
[help]
  autocorrect = 1