gitconfig

[color]
  ui = true
[merge]
  tool = p4merge
[mergetool "extMerge"]
  cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
  trustExitCode = false
[user]
  name = Ilja Krijger
  email = ilja@quittheprogram.org
[alias]
  lol = log --graph --all --format=format:'%C(blue)%h%C(reset) - %C(green)[%ad]%C(reset) %s %C(cyan)~ %an%C(reset)%C(yellow)%d%C(reset)' --abbrev-commit --date=relative
  lool = log --graph --all --format=format:'%C(blue)%h%C(reset) - %C(green)%aD%C(reset) %C(green)(%ar)%C(reset)%C(yellow)%d%C(reset)%n''          %s %C(cyan)~ %an%C(reset)' --abbrev-commit
  dfw = diff --color --color-words --abbrev
  st = status -sb
[color "branch"]
  current = magenta reverse
  local = magenta
  remote = blue
[color "diff"]
  meta = yellow
  frag = blue
  old = red
  new = green
  commit = yellow
  whitespace = normal black
[color "status"]
  added = yellow
  changed = green
  untracked = cyan
[core]
  editor = /usr/bin/vim
[mergetool]
  keepBackup = false
  prompt = false
[diff]
  algorithm = patience
[push]
  default = simple
[filter "media"]
  clean = git-media-clean %f
  smudge = git-media-smudge %f
[mergetool "p4merge"]
  path = /usr/local/bin/p4merge