6 #prxy = http://username:password@192.168.9.10:8080
15 pager = less -FXRS -x4
23 #submodulesummary = true ; reduces speed of 'git status'
25 wdiff = diff -w --word-diff-regex="[^[:space:]]"
26 wlog = log -w --word-diff-regex="[^[:space:]]"
27 wshow = show -w --word-diff-regex="[^[:space:]]"
37 cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
43 cmd = "vi -f \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" -c 'SpliceInit'"
45 [mergetool "nvimdiff"]
46 cmd = "nvim -d \"$LOCAL\" \"$REMOTE\" \"$MERGED\" -c 'wincmd w' -c 'wincmd J'"