2 amend = commit --amend -C HEAD
10 lg = log --decorate --graph
11 lg1 = log --decorate --graph --oneline
12 lg5 = log --decorate --graph -5
14 stb = status --short --branch
15 wdiff = diff --word-diff
20 # Adapted from http://shallowsky.com/blog/programming/gitcolors.html
21 # and http://www.ansdb.com/649-git-colors-for-light-background
36 # commit = bold yellow
42 # whitespace = normal red
50 whitespace = normal red
58 #[color "interactive"]
81 pager = less -FRSXgimq
86 #[mergetool "vimdiff3"]
87 # Don't forget to add -f for gvim
89 # cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
92 denyNonFastForwards = true
97 [browser "webbrowser"]
101 fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
102 fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0