.gitconfig

[core]
  editor = vim
  excludesfile = ~/.gitignore_global
  # Treat spaces before tabs and all kinds of trailing whitespace as an error.
  # [default] trailing-space: looks for spaces at the end of a line
  # [default] space-before-tab: looks for spaces before tabs at the beginning of
  # a line
  whitespace = space-before-tab,-indent-with-non-tab,trailing-space
  # Make `git rebase` safer on OS X
  # More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
  trustctime = false
[apply]
  # Detect whitespace errors when applying a patch
  whitespace = fix
[user]
  email = [email protected]
  name = Álvaro Naveda
[alias]
  ci = commit -m
  cia = commit -a -m
  co = checkout
  k = !gitk --all
  f = fetch --all
  komp = !git diff | kompare -
  kompc = !git diff --cached | kompare -
  st = status
  br = branch
  pl = pull
  p = push
  rt = remote
  rb = rebase
  rbi = rebase -i
  ad = add .
  undo = reset HEAD^
  pk = cherry-pick
  last = cat-file commit HEAD
  l = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
  lb = log --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'
  pom = push origin master
  phm = push heroku master
  plom = pull origin master