Update karabiner

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index fb57ba11c5370eedccef07d7f6bdc398dd15f8f6..08ed718ca6686e415876e067eb3f08f4f4e54cee 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,23 +1,34 @@
 [user]
-       name = Ruben Beltran del Rio
-       email = ruben@unlimited.pizza
-       signingkey = B7C3495D98F27947
+  name = Ruben Beltran del Rio
+  email = git@r.bdr.sh
+  signingkey = 85D81B97D96211C7
 [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
+  external = difft
+  tool = vimdiff
+  algorithm = histogram
+[merge]
+  tool = nvim
+  conflictstyle = zdiff3
+[mergetool]
+  keepBackup = false
+[mergetool "nvim"]
+  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'