.gitconfig

[user]
  name = Joshua Timberman
  email = joshua@housepub.org
[color]
  ui = true
  diff = true
  status = true
  branch = true
  interactive = true
[core]
  editor = $EDITOR
  excludesfile = $HOME/.gitignore
  whitespace = fix
  trustctime = false
[format]
  pretty = %C(bold yellow)%h%Creset %s %C(bold blue)[%an]%Creset %Cgreen(%cr)
[apply]
  whitespace = fix
[help]
  autocorrect = 5
[push]
  default = tracking
[branch]
  autosetuprebase = always
[credential]
  helper = osxkeychain
[pull]
  rebase = preserve
[alias]
  up = !git pull origin master
  pr = "!f() { git fetch origin pull/$1/head:pr-$1 && git checkout pr-$1 && git pull origin master; }; f"