Use nvim for mergetool

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index 485954e152f1e06333b6b1dbb379e5b5f9757740..f3cb18daacf448df468df76763858ff8b3ae8b52 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,7 +1,12 @@
 [user]
        name = Ruben Beltran del Rio
        email = ruben@unlimited.pizza
-       signingkey = B7C3495D98F27947
+  signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5
+[sendemail]
+       smtpserver = smtp.fastmail.com
+       smtpuser = ruben@unlimited.pizza
+       smtpencryption = ssl
+       smtpserverport = 465
 [core]
        editor = nvim
 [color]
@@ -12,3 +17,14 @@
   rebase = false
 [commit]
        gpgsign = true
+[init]
+       defaultBranch = main
+[diff]
+  external = difft
+       tool = vimdiff
+[merge]
+  tool = nvim
+[mergetool]
+  keepBackup = false
+[mergetool "nvim"]
+  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'