X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/2a55fbef3406d4c51c395994d6763db3d20c3693..refs/heads/main:/gitconfig

diff --git a/gitconfig b/gitconfig
index fb57ba1..8fca402 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,10 +1,10 @@
 [user]
 	name = Ruben Beltran del Rio
-	email = ruben@unlimited.pizza
-	signingkey = B7C3495D98F27947
+	email = git@r.bdr.sh
+  signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5
 [sendemail]
 	smtpserver = smtp.fastmail.com
-	smtpuser = ruben@unlimited.pizza
+	smtpuser = r@bdr.sh
 	smtpencryption = ssl
 	smtpserverport = 465
 [core]
@@ -20,4 +20,11 @@
 [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'