Update deps

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index f3cb18daacf448df468df76763858ff8b3ae8b52..ff81aab25f4addbaea4f92242dd2a5267461fd22 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,10 +1,10 @@
 [user]
        name = Ruben Beltran del Rio
 [user]
        name = Ruben Beltran del Rio

-       email = ruben@unlimited.pizza
+       email = git@r.bdr.sh

   signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5
 [sendemail]
        smtpserver = smtp.fastmail.com
   signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5
 [sendemail]
        smtpserver = smtp.fastmail.com

-       smtpuser = ruben@unlimited.pizza
+       smtpuser = r@bdr.sh

        smtpencryption = ssl
        smtpserverport = 465
 [core]
        smtpencryption = ssl
        smtpserverport = 465
 [core]


@@ -24,6 +24,7 @@
        tool = vimdiff
 [merge]
   tool = nvim
        tool = vimdiff
 [merge]
   tool = nvim

+  conflictstyle = zdiff3

 [mergetool]
   keepBackup = false
 [mergetool "nvim"]
 [mergetool]
   keepBackup = false
 [mergetool "nvim"]