2 alias = "!f() { [ $# = 2 ] && git config --global alias.\"$1\" \"$2\" && return 0 || echo \"Usage: git alias <new alias> <original command>\" >&2 && return 1; }; f"
3 aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
6 camend = commit --amend -C HEAD
12 dshow = show --decorate
14 l1 = log --decorate --oneline
15 l5 = log --decorate -5
16 lg = log --decorate --graph
17 lg1 = log --decorate --graph --oneline
18 lg5 = log --decorate --graph -5
19 lr = log --decorate --reverse
20 lr1 = log --decorate --reverse --oneline
21 lr5 = log --decorate --reverse -5
22 null-merge = merge --strategy=ours
24 ri = "!f() { git rebase --interactive --autosquash --preserve-merges ${1:-\"@{u\\}\"}; }; f"
26 root = rev-parse --show-toplevel
28 stb = status --short --branch
30 unstage = reset HEAD --
31 wdiff = diff --word-diff
32 wshow = show --word-diff --decorate
35 autosetuprebase = always
41 path = ~/lib/config/git/light_bg
49 #[mergetool "vimdiff3"]
50 # Don't forget to add -f for gvim
52 # cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
55 denyNonFastForwards = true
60 [browser "webbrowser"]
64 fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
65 fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0