My git config

.gitconfig

[user]
  name = Aaron Crickenberger
  email = spiffxp@gmail.com
[alias]
  br = branch
  ca = commit --amend
  ci = commit
  cp = cherry-pick
  co = checkout
  fp = fetch --prune
  mf = merge --ff-only
  mnf = merge --no-ff
  pf = pull --ff-only
  rb = rebase
  rbc = rebase --continue
  st = status
[color]
  ui = true
[merge]
  tool = p4merge
[mergetool]
  prompt = false
  keepBackup = false
[mergetool "p4merge"]
  path = /usr/local/bin/p4merge