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/[ ]/ = /'
10 camend = commit --amend -C HEAD
16 dshow = show --decorate
18 l1 = log --decorate --oneline
19 l5 = log --decorate -5
20 lg = log --decorate --graph
21 lg1 = log --decorate --graph --oneline
22 lg5 = log --decorate --graph -5
23 lr = log --decorate --reverse
24 lr1 = log --decorate --reverse --oneline
25 lr5 = log --decorate --reverse -5
26 null-merge = merge --strategy=ours
28 ri = "!f() { git rebase --interactive --autosquash --preserve-merges ${1:-\"@{u\\}\"}; }; f"
30 root = rev-parse --show-toplevel
32 stb = status --short --branch
34 unstage = reset HEAD --
35 wdiff = diff --word-diff
36 wshow = show --word-diff --decorate
39 autosetuprebase = always
45 path = ~/lib/config/git/light_bg
53 #[mergetool "vimdiff3"]
54 # Don't forget to add -f for gvim
56 # cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
59 denyNonFastForwards = true
64 [browser "webbrowser"]
68 fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
69 fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0