gitconfig

[user]
  name =
  email =
[github]
  user =
  token =
[color]
  ui = true
[alias]
  st = status -sb
  ci = commit
  co = checkout
  br = branch
  cp = cherry-pick
  up = pull --rebase
  ff = pull --ff-only
  lg = log --decorate
  logs = log --stat --decorate
  logg = log --graph --decorate --branches --remotes
  pop = stash pop
  override = !sh -c 'echo git add -- $0 && echo git reset HEAD -q -- $0 && echo git checkout -- $0'
  wu = log --stat origin..@{0}
  unadd = rm --cached
  sup = !git stash && git up && git pop
  sff = !git stash && git ff && git pop

  # force stash pop to apply, even if there are uncommitted changes
  popf = !git stash show -p | git apply && git stash drop
  applyf = !git stash show -p | git apply

  # check if a branch has been merged into the current HEAD
  merged = !sh -c 'git rev-list HEAD | grep $(git rev-parse $0)'

  # git svn aliases
  #spull = !git svn fetch && git svn rebase -l
  srebase = !git stash && git svn rebase -l && git stash pop
  sdcommit = !git stash && git svn dcommit && git stash pop

  purge-remote = !sh -c 'echo git branch -a | echo sed -n \"/master$/d;s?^ *remotes/$0/??p\"'
[mergetool "mvimdiff"]
  cmd = mvimdiff \"$LOCAL\" \"$REMOTE\" \"$MERGED\" \"$BASE\"
[mergetool "p4merge"]
  cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
  trustExitCode = false
[mergetool]
  keepBackup = false
[merge]
  tool = p4merge
[push]
  default = current
[core]
  excludesfile = /Users/wade/.gitignore