[user] name = Stefan Huber email = me@example.com signingkey = 0123456 [http] #prxy = http://username:password@192.168.9.10:8080 [color] ui = auto status = auto branch = auto diff = auto interactive = auto [core] editor = vi pager = less -FXRS -x4 [init] defaultBranch = main [push] default = simple [pull] rebase = true [status] #submodulesummary = true ; reduces speed of 'git status' [alias] wdiff = diff -w --word-diff-regex="[^[:space:]]" wlog = log -w --word-diff-regex="[^[:space:]]" wshow = show -w --word-diff-regex="[^[:space:]]" [log] decorate [diff] renames = true submodule = log tool = nvimdiff [difftool] prompt = false [difftool "nvimdiff"] cmd = "nvim -d \"$LOCAL\" \"$REMOTE\"" [merge] tool = nvimdiff [mergetool] prompt = true [mergetool "splice"] cmd = "vi -f \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" -c 'SpliceInit'" trustExitCode = true [mergetool "nvimdiff"] cmd = "nvim -d \"$LOCAL\" \"$REMOTE\" \"$MERGED\" -c 'wincmd w' -c 'wincmd J'"