gitconfig

[log]
  decorate = short
[alias]
  a       = add
  ae      = add -e
  ai      = add -i
  alias   = !git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1\\t=> \\2/' | sort
  ap      = add -p
  br      = branch
  brd     = branch -d
  ci      = commit
  cia     = commit -a
  civ     = commit -v
  cl      = !git clone git@git:$1
  co      = checkout
  cob     = checkout -b
  cp      = cherry-pick
  df      = diff
  ds      = diff --staged
  ignore  = !([ ! -e .gitignore ] && touch .gitignore ) | echo $1 >> .gitignore
  lf      = log -u
  lp      = log -p
  lol     = log --graph --decorate --pretty=oneline --abbrev-commit
  lola    = log --graph --decorate --pretty=oneline --abbrev-commit --all
  mend    = commit --amend
  ls      = ls-files
  lsu     = ls-files -u
  ours    = checkout --ours
  rp      = reset -p
  serve   = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git
  sl      = shortlog
  st      = status -sb
  stl     = status
  theirs  = checkout --theirs
  this    = !git init && git add . && git commit
  undo    = reset HEAD
  untrack = rm --cached
  vdf     = difftool
  vds     = difftool --staged
[color]
  ui = auto
[pager]
  status = true
  show-branch = true
  diff = true
[merge]
  tool = vimdiff
  conflictstyle = diff3
  state = true
[mergetool]
  keepBackup = false
[diff]
  tool = vimdiff
  algorithm = patience
  renames = copies
  mnemonicprefix = true
[difftool]
  prompt = false
[format]
  numbered = auto
[user]
  name = Bryan Patrick Wood
  email = bpwood@solipsys.com
[branch]
  autosetuprebase = always
[core]
  autocrlf = false
  pager = less -r
  excludesfile = "~/.gitignore"
  #whitespace = trailing-space,space-before-tab
[push]
  default = upstream
[rerere]
  enabled = true
[instaweb]
  local = true
  httpd = apache2 -f
  port = 12345
  browser = chrome
  modulepath = /usr/lib/apache2/modules
[commit]
  #template = ~/.gitmessage.txt
[help]
  #autocorrect = 10