gitconfig

[user]
  # nicer commit messages :-)
  name = Kyle Johnson
  email = kyle@[xyz].com
[core]
  # this is really just for simple commit statements, so pick something console-based, nano is great
  editor = nano
[merge]
  tool = p4mergetool
[mergetool]
  # to keep repos clean
  keepBackup = false
[color]
  diff = always
[push]
  default = tracking
[alias]
  unstage = reset HEAD --
  undo = reset --soft HEAD^
  assume = update-index --assume-unchanged
  unassume = update-index --no-assume-unchanged
  assumed = "!git ls-files -v | grep ^h | cut -c 3-"
  unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged"
  ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
  ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
  df = diff
[diff]
  submodule = log
[status]
  submodulesummary = 1
[mergetool "p4mergetool"]
  cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED