From 04b083ae65a38409a668aa0ca8e8b59904f08e60 Mon Sep 17 00:00:00 2001 From: Ruben Beltran del Rio Date: Mon, 19 Feb 2024 20:53:09 +0100 Subject: Update git config --- gitconfig | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'gitconfig') diff --git a/gitconfig b/gitconfig index ff81aab..da096be 100644 --- a/gitconfig +++ b/gitconfig @@ -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 -- cgit