Remove orgmode

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index 8fca4027131952b3d057de9c46508df59f45d851..da096bebbcef9320fffe07c680892a1c19d31ecb 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,29 +1,33 @@
 [user]
 [user]

-       name = Ruben Beltran del Rio
-       email = git@r.bdr.sh
+  name = Ruben Beltran del Rio
+  email = git@r.bdr.sh

   signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5
 [sendemail]
   signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5
 [sendemail]

-       smtpserver = smtp.fastmail.com
-       smtpuser = r@bdr.sh
-       smtpencryption = ssl
-       smtpserverport = 465
+  smtpserver = smtp.fastmail.com
+  smtpuser = r@bdr.sh
+  smtpencryption = ssl
+  smtpserverport = 465

 [core]
 [core]

-       editor = nvim
+  pager = delta
+  editor = nvim

 [color]
 [color]

-       diff = auto
+  diff = auto

 [push]
 [push]

-       default = simple
+  default = simple
+  autoSetupRemote = true

 [pull]
   rebase = false
 [commit]
 [pull]
   rebase = false
 [commit]

-       gpgsign = true
+  gpgsign = true

 [init]
 [init]

-       defaultBranch = main
+  defaultBranch = main

 [diff]
   external = difft
 [diff]
   external = difft

-       tool = vimdiff
+  tool = vimdiff
+  algorithm = histogram

 [merge]
   tool = nvim
 [merge]
   tool = nvim

+  conflictstyle = zdiff3

 [mergetool]
   keepBackup = false
 [mergetool "nvim"]
 [mergetool]
   keepBackup = false
 [mergetool "nvim"]