My Git setup

.gitconfig

[core]
  editor = vim
[alias]
  s  = status
  st = status
  ci = commit
  b  = branch
  br = branch
  ba = branch -a
  co = checkout
  df = diff --diff-filter=M
  d  = diff --diff-filter=M
  lp = log -p
  lg = log
  l  = log
  lol = log --graph --decorate --pretty=oneline --abbrev-commit
  lolz = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
  w  = show
  h  = show
  dc = diff --cached --diff-filter=M
  rev = remote -v
  ls = ls-files
  goku = push heroku master
  ign = ls-files -o -i --exclude-standard
  on = update-index --no-assume-unchanged
  off = update-index --assume-unchanged
  next = rebase --continue
  ok = rebase --continue
  fail = rebase --abort
  skip = rebase --skip
[color]
  diff = auto
  status = auto
  branch = auto
[push]
  default = current