Archives/foodotfiles
2
1
Fork 0
mirror of https://git.korhonen.cc/FunctionalHacker/dotfiles.git synced 2024-11-18 21:27:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revised git config difftool and mergetool

Browse Source
This commit is contained in:
Marko Korhonen 2020-01-21 19:19:44 +02:00
parent fbbc89f2cd
commit ca22f887f1
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
home/.gitconfig
View File

@ -2,19 +2,24 @@
email = marko.korhonen@reekynet.com email = marko.korhonen@reekynet.com
name = Marko Korhonen name = Marko Korhonen
signingkey = C514037F1EFF4FA6 signingkey = C514037F1EFF4FA6
[commit] [commit]
signoff = true signoff = true
gpgsign = 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
[tag] [tag]
gpgSign = true gpgSign = true
signoff = true signoff = true
[format]
signoff = true
[merge]
prompt = false
tool = nvim-merge
[mergetool "nvim-merge"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[diff]
prompt = false
tool = nvim-diff
[difftool "nvim-diff"]
cmd = nvim -d -c 'set nomodifiable'