.gitconfig

[user]
  name = Peter Harkins
  email = ph@push.cx
[color]
  ui = auto
[alias]
  a   = add
  aa  = add --all
  ai  = add --interactive
  ap  = add --patch
  b   = branch
  bi  = bisect
  bl  = blame
  c   = checkout
  ci  = commit -v
  cia = commit -v --amend
  cl  = clone
  co  = checkout
  cp  = cherry-pick
  dd  = !git rm `git ls-files -d`
  d   = diff
  dc  = diff --cached
  dw  = diff -w
  f   = fetch --all
  ff  = merge --ff-only
  k   = !gitk --all &
  l   = log --graph --abbrev-commit --decorate --all
  lo  = log --graph --abbrev-commit --decorate
  m   = merge --no-ff
  mb  = branch -f
  min = gc --aggressive --prune=now
  p   = pull
  pff = pull --ff-only
  rc  = rebase --continue
  ri  = rebase -i
  rh  = reset HEAD
  rb  = checkout --track -b $0 origin/$1
  s   = show
  sb  = remote show origin # show remote branches
  sm  = submodule
  smu = submodule update
  sp  = stash pop
  ss  = stash save
  st  = status -sb
  undo = reset --hard HEAD@{1}
  vd  = difftool
  w   = whatchanged -p
  # http://gitready.com/advanced/2011/10/21/ribbon-and-catchup-reading-new-commits.html
  ribbon = tag --force _ribbon origin/master
  catchup = log --patch --reverse --topo-order _ribbon..origin/master
[github]
  user = pushcx
[core]
  excludesfile = /home/harkins/.gitignore
  pager = less -F
  editor = vim -c ':normal gg'
  autocrlf = false
  safecrlf = true
  whitespace = trailing-space,space-before-tab
[branch]
  autosetupmerge = always
[diff]
  tool = vimdiff
  word-diff = color
  renames = copies
  mnemonicprefix = true
[pull]
  rebase = true
[push]
  default = tracking
[rerere]
  enabled = true
[merge]
  stat = true
  tool = threesome
[mergetool "threesome"]
  cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
  trustExitCode = true
[format]
    pretty=format:%C(yellow)%h%Creset%C(red)%d%Creset %s [%Cgreen%ar, %C(yellow)%an%Creset]
[url "git://github.com/"]
  insteadOf = gh:
# Any GitHub repo with my username should be checked out r/w by default
# http://rentzsch.tumblr.com/post/564806957/public-but-hackable-git-submodules
[url "git@github.com:pushcx/"]
  insteadOf = "git://github.com/pushcx/"