foodotfiles/home/.gitconfig

[user]
	email = marko.korhonen@reekynet.com
	name = Marko Korhonen
	signingkey = C514037F1EFF4FA6
[commit]
	signoff = true
	gpgsign = true
[diff]
    tool = vimdiff
[merge]
    tool = vimdiff
    conflictstyle = diff3
[mergetool "vimdiff"]
    cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
Removed commit history Signed-off-by: Marko Korhonen <marko.korhonen@reekynet.com> 2019-10-26 17:05:31 +00:00			`[user]`
			`email = marko.korhonen@reekynet.com`
			`name = Marko Korhonen`
			`signingkey = C514037F1EFF4FA6`
			`[commit]`
			`signoff = true`
			`gpgsign = true`
Made neovim work as vimdiff Signed-off-by: Marko Korhonen <marko.korhonen@reekynet.com> 2019-10-27 20:43:52 +00:00			`[diff]`
			`tool = vimdiff`
			`[merge]`
			`tool = vimdiff`
			`conflictstyle = diff3`
			`[mergetool "vimdiff"]`
			`cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'`