Use difftastic, apply java set home

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index 2f7f713fc3b9203f72c266d9540d62cb1b7e260e..fb57ba11c5370eedccef07d7f6bdc398dd15f8f6 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -2,11 +2,22 @@
        name = Ruben Beltran del Rio
        email = ruben@unlimited.pizza
        signingkey = B7C3495D98F27947
+[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
+[init]
+       defaultBranch = main
+[diff]
+    external = difft