sysadmin/dotfiles
1
0
Fork 0
Code Issues Pull requests 1 Activity

use nvim as mergetool in git with 3 panes

Browse source
This commit is contained in:
Bruno Carlin 2020-06-17 19:58:20 +02:00
parent d66a19b62e
commit 28266990bf
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
git/.gitconfig
View file

@ -28,8 +28,12 @@
insteadOf = https://code.waarp.fr insteadOf = https://code.waarp.fr
[core] [core]
pager = delta --dark --theme 'Solarized (dark)' pager = delta --dark --theme 'Solarized (dark)'
# define command which will be used when "nvim" is set as a merge tool
[mergetool "nvim"]
cmd = nvim -d $LOCAL $MERGED $REMOTE -c 'wincmd l'
[merge] [merge]
tool = vimdiff #tool = vimdiff
tool = nvim
guitool = meld guitool = meld
[pull] [pull]
rebase = false rebase = false