Use difftastic, apply java set home

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index d426b5cdf804ba385baef942ae72418ef93ac891..fb57ba11c5370eedccef07d7f6bdc398dd15f8f6 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,14 +1,23 @@
 [user]
 [user]

-       name = Ben Beltran
-       email = ben@nsovocal.com
-       signingkey = 8ABB89672AFB58F5
+       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]
 [core]

-       editor = vim
+       editor = nvim

 [color]
        diff = auto
 [push]
        default = simple
 [color]
        diff = auto
 [push]
        default = simple

+[pull]
+  rebase = false

 [commit]
        gpgsign = true
 [commit]
        gpgsign = true

-[gpg]
-       program = gpg2
+[init]
+       defaultBranch = main
+[diff]
+    external = difft