X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/089ad2dd938f9caabf21bfbf52179dcdf4a8c6f2..37b37cfc94fb2e091520f012c657630d11d3f940:/gitconfig

diff --git a/gitconfig b/gitconfig
index f3cb18d..da096be 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,29 +1,33 @@
 [user]
-	name = Ruben Beltran del Rio
-	email = ruben@unlimited.pizza
+  name = Ruben Beltran del Rio
+  email = git@r.bdr.sh
   signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5
 [sendemail]
-	smtpserver = smtp.fastmail.com
-	smtpuser = ruben@unlimited.pizza
-	smtpencryption = ssl
-	smtpserverport = 465
+  smtpserver = smtp.fastmail.com
+  smtpuser = r@bdr.sh
+  smtpencryption = ssl
+  smtpserverport = 465
 [core]
-	editor = nvim
+  pager = delta
+  editor = nvim
 [color]
-	diff = auto
+  diff = auto
 [push]
-	default = simple
+  default = simple
+  autoSetupRemote = true
 [pull]
   rebase = false
 [commit]
-	gpgsign = true
+  gpgsign = true
 [init]
-	defaultBranch = main
+  defaultBranch = main
 [diff]
   external = difft
-	tool = vimdiff
+  tool = vimdiff
+  algorithm = histogram
 [merge]
   tool = nvim
+  conflictstyle = zdiff3
 [mergetool]
   keepBackup = false
 [mergetool "nvim"]