diff options
| -rw-r--r-- | gitconfig | 27 |
1 files changed, 15 insertions, 12 deletions
@@ -1,27 +1,30 @@ [user] - name = Ruben Beltran del Rio - email = git@r.bdr.sh + name = Ruben Beltran del Rio + email = git@r.bdr.sh 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] - 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 - tool = vimdiff + tool = vimdiff + algorithm = histogram [merge] tool = nvim conflictstyle = zdiff3 |