FunctionalHacker/dotfiles
FunctionalHacker/dotfiles
2
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

Nvim: add diffview plugin

Browse source
This commit is contained in:
Marko Korhonen 2024-01-24 13:51:39 +02:00
parent 6997121c4e
commit bb75584fa2
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
home/.config/git/config
View file

@ -28,7 +28,7 @@ keepBackup = false
prompt = false
[mergetool "nvim"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
cmd = nvim +DiffviewOpen
[diff]
tool = nvim
@ -37,7 +37,7 @@ tool = nvim
prompt = false
[difftool "nvim"]
cmd = nvim -d $LOCAL $REMOTE
cmd = nvim +DiffviewOpen
[pull]
rebase = merges