X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/afc8c9e85bc5b6c672265f86242a94d8013133b2..634aae63eb062da5abc4f8cccb46944b2ee8db3e:/gitconfig?ds=sidebyside

diff --git a/gitconfig b/gitconfig
index 712e4df..f3cb18d 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,7 +1,7 @@
 [user]
 	name = Ruben Beltran del Rio
 	email = ruben@unlimited.pizza
-	signingkey = B7C3495D98F27947
+  signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5
 [sendemail]
 	smtpserver = smtp.fastmail.com
 	smtpuser = ruben@unlimited.pizza
@@ -19,3 +19,12 @@
 	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'