[user] name = Stefan Huber email = me@example.com signingkey = 0123456 [color] ui = 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 --color-words wlog = log --color-words [diff] renames = true