diff options
| author | Ruben Beltran del Rio <git@r.bdr.sh> | 2024-02-19 20:53:09 +0100 |
|---|---|---|
| committer | Ruben Beltran del Rio <git@r.bdr.sh> | 2024-02-19 20:53:09 +0100 |
| commit | 04b083ae65a38409a668aa0ca8e8b59904f08e60 (patch) | |
| tree | abcabec8b4261bc15555b50d3ce0603f374c74fe /gitconfig | |
| parent | 576efa2bc88015ec8bf34ede4330ff7286035908 (diff) | |
Update git config
Diffstat (limited to 'gitconfig')
| -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 |