Merge branch 'master' of ssh://aristoteles.sthu.org:2407/~/gitweb/shutils
[shutils.git] / dotfiles / gitconfig
1 [user]
2 name = Stefan Huber
3 email = me@example.com
4 signingkey = 0123456
5 [color]
6 ui = auto
7 [core]
8 editor = vim
9 pager = less -FXRS -x4
10 [merge]
11 tool = splice
12 [mergetool "splice"]
13 cmd = "gvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
14 trustExitCode = true
15 [alias]
16 wdiff = diff --color-words
17 wlog = log --color-words
18 [diff]
19 renames = true