dotfiles/home/.gitconfig
Marko Korhonen 46a7f1ee52 Fixed vimdiff
Signed-off-by: Marko Korhonen <marko.korhonen@reekynet.com>
2019-10-27 22:48:21 +02:00

18 lines
334 B
INI

[user]
email = marko.korhonen@reekynet.com
name = Marko Korhonen
signingkey = C514037F1EFF4FA6
[commit]
signoff = true
gpgsign = true
[merge]
tool = vimdiff
[mergetool]
prompt = true
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[difftool]
prompt = false
[diff]
tool = vimdiff