2 amend = commit --amend -C HEAD
11 l1 = log --decorate --oneline
12 l5 = log --decorate -5
13 lg = log --decorate --graph
14 lg1 = log --decorate --graph --oneline
15 lg5 = log --decorate --graph -5
16 lr = log --decorate --reverse
17 lr1 = log --decorate --reverse --oneline
18 lr5 = log --decorate --reverse -5
20 stb = status --short --branch
21 wdiff = diff --word-diff
26 # Adapted from http://shallowsky.com/blog/programming/gitcolors.html
27 # and http://www.ansdb.com/649-git-colors-for-light-background
42 # commit = bold yellow
48 # whitespace = normal red
56 whitespace = normal red
64 #[color "interactive"]
87 pager = less -FRSXgimq
92 #[mergetool "vimdiff3"]
93 # Don't forget to add -f for gvim
95 # cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
98 denyNonFastForwards = true
103 [browser "webbrowser"]
107 fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
108 fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0