4 camend = commit --amend -C HEAD
10 dshow = show --decorate
12 l1 = log --decorate --oneline
13 l5 = log --decorate -5
14 lg = log --decorate --graph
15 lg1 = log --decorate --graph --oneline
16 lg5 = log --decorate --graph -5
17 lr = log --decorate --reverse
18 lr1 = log --decorate --reverse --oneline
19 lr5 = log --decorate --reverse -5
20 null-merge = merge --strategy=ours
22 ri = "!sh -c 'git rebase --interactive --autosquash --preserve-merges ${1:-\"@{u}\"}' -"
23 root = rev-parse --show-toplevel
26 stb = status --short --branch
28 unstage = reset HEAD --
29 wdiff = diff --word-diff
30 wshow = show --word-diff --decorate
33 autosetuprebase = always
39 path = ~/lib/config/git/light_bg
47 #[mergetool "vimdiff3"]
48 # Don't forget to add -f for gvim
50 # cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
53 denyNonFastForwards = true
58 [browser "webbrowser"]
62 fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
63 fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0