Use nvim for mergetool

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index fb57ba11c5370eedccef07d7f6bdc398dd15f8f6..f3cb18daacf448df468df76763858ff8b3ae8b52 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,7 +1,7 @@
 [user]
        name = Ruben Beltran del Rio
        email = ruben@unlimited.pizza
 [user]
        name = Ruben Beltran del Rio
        email = ruben@unlimited.pizza

-       signingkey = B7C3495D98F27947
+  signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5

 [sendemail]
        smtpserver = smtp.fastmail.com
        smtpuser = ruben@unlimited.pizza
 [sendemail]
        smtpserver = smtp.fastmail.com
        smtpuser = ruben@unlimited.pizza


@@ -20,4 +20,11 @@
 [init]
        defaultBranch = main
 [diff]
 [init]
        defaultBranch = main
 [diff]

-    external = difft
+  external = difft
+       tool = vimdiff
+[merge]
+  tool = nvim
+[mergetool]
+  keepBackup = false
+[mergetool "nvim"]
+  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'