.gitconfig

[user]
  name = nunommc
  email = enter_email@here.com

[color]
  ui = auto
  decorate = short

[alias]
   ci = commit
   co = checkout
   br = branch
   di = diff -w --color-words
   st = status -s

   # aliases that match the hg in / out commands
   out      = !git fetch && git log FETCH_HEAD..
   in       = !git fetch && git log ..FETCH_HEAD
   # fetch and show what would be merged (use option "-p" to see patch)
   incoming = "!git remote update -p; git log ..@{u}"
   # what would be pushed (currently committed); see also alias difr
   outgoing = log @{u}..
   sortcommits = for-each-ref --sort=-committerdate --format='%(authorname) :: %(committerdate:short) :: %(refname:short)' refs/heads/
   hist = log --color --pretty=format:\"%C(yellow)%h%C(reset) %s%C(bold red)%d%C(reset) %C(green)%ad%C(reset) %C(blue)[%an]%C(reset)\" --relative-date --decorate
   unstage = reset HEAD --
   graph = log --color --graph --pretty=format:\"%h | %ad | %an | %s%d\" --date=short
   mergepreview = merge --no-commit --no-ff
   brchanges = log --cherry-mark --oneline ...master

[push]
   default = matching

[diff]
   tool = vimdiff

[difftool]
   prompt = false