Update XDG_CONFIG_HOME

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index 6f232380f691ad1975fded654a1f3d6ce2ee8cd5..f3cb18daacf448df468df76763858ff8b3ae8b52 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,14 +1,30 @@
 [user]
-       name = Ben Beltran
-       email = ben@nsovocal.com
-       signingkey = C4F2921ED27B8DBA
+       name = Ruben Beltran del Rio
+       email = ruben@unlimited.pizza
+  signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5
+[sendemail]
+       smtpserver = smtp.fastmail.com
+       smtpuser = ruben@unlimited.pizza
+       smtpencryption = ssl
+       smtpserverport = 465
 [core]
-       editor = vim
+       editor = nvim
 [color]
        diff = auto
 [push]
        default = simple
+[pull]
+  rebase = false
 [commit]
        gpgsign = true
-[gpg]
-       program = gpg2
+[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'