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/[ ]/ = /'
5 branches = branch --all
10 camend = commit --amend --no-edit
16 dshow = show --decorate
17 incoming = !git remote update --prune; git log ..@{upstream}
19 l1 = log --decorate --oneline
20 l5 = log --decorate -5
21 lg = log --decorate --graph
22 lg1 = log --decorate --graph --oneline
23 lg5 = log --decorate --graph -5
24 lr = log --decorate --reverse
25 lr1 = log --decorate --reverse --oneline
26 lr5 = log --decorate --reverse -5
27 null-merge = merge --strategy=ours
28 outgoing = log @{upstream}..
30 ri = "!f() { git rebase --interactive --autosquash --preserve-merges ${1:-\"@{upstream\\}\"}; }; f"
32 root = rev-parse --show-toplevel
34 stb = status --short --branch
36 unstage = reset HEAD --
37 wdiff = diff --word-diff
38 wshow = show --word-diff --decorate
41 autosetuprebase = always
47 path = ~/lib/config/git/light_bg
55 #[mergetool "vimdiff3"]
56 # Don't forget to add -f for gvim
58 # cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
61 denyNonFastForwards = true
66 [browser "webbrowser"]
70 fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
71 fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0