.gitconfig

[user]
  name  = Gianni Chiappetta
  email = gianni@runlevel6.org

[alias]
  br   = branch
  ; Example: g ch master...staging
  ch   = log --cherry --pretty=format:\"%C(auto)%h (%ar) %an: %s\" --date-order --reverse
  ci   = commit
  co   = checkout
  df   = diff
  g    = grep -I
  lg   = log -p
  loq  = log --graph --all --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(bold white)— %an%C(reset)%C(bold yellow)%d%C(reset)' --abbrev-commit --date=relative
  st   = status
  find = log --pretty=\"format:%Cgreen%H %Cblue%s\" --name-status --grep

[branch]
  autosetuprebase = always

[color]
  ui = auto

[color "branch"]
  current = yellow reverse
  local   = yellow
  remote  = green

[color "diff"]
  meta = yellow 
  frag = magenta 
  old  = red 
  new  = green 

[color "status"]
  added     = yellow
  changed   = green
  untracked = cyan

[diff]
  tool = diffconflicts

[diff "exif"]
  textconv = exiftool

[difftool]
  prompt = false

[merge]
  log  = true
  tool = diffconflicts

[push]
  default = simple

[rerere]
  enabled = 1

[url "git@github.com:"]
  insteadOf     = "gh:"
  pushInsteadOf = "github:"
  pushInsteadOf = "git://github.com/"

[url "git://github.com/"]
  insteadOf = "github:"

[url "git@gist.github.com:"]
  insteadOf     = "gst:"
  pushInsteadOf = "gist:"
  pushInsteadOf = "git://gist.github.com/"

[url "git://gist.github.com/"]
  insteadOf = "gist:"

[url "git@heroku.com:"]
  insteadOf = "heroku:"

[filter "media"]
  clean  = git-media-clean %f
  smudge = git-media-smudge %f

[difftool "diffconflicts"]
  cmd = diffconflicts mvim $BASE $LOCAL $REMOTE $MERGED

[mergetool "diffconflicts"]
  cmd           = diffconflicts mvim $BASE $LOCAL $REMOTE $MERGED
  trustExitCode = true
  keepBackup    = false