[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 = vim pager = less -FXRS -x4 [merge] tool = splice [mergetool "splice"] cmd = "gvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'" trustExitCode = true [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 [status] #submodulesummary = true ; reduces speed of 'git status' [push] default = simple