]>
Commit | Line | Data |
---|---|---|
f853d479 | 1 | [user] |
715c6b08 | 2 | name = Ruben Beltran del Rio |
967de9a2 | 3 | email = git@r.bdr.sh |
d2013186 | 4 | signingkey = CF016B28A85750E3C1B80CEB14871BABBDF9DFF5 |
19afe8a8 RBR |
5 | [sendemail] |
6 | smtpserver = smtp.fastmail.com | |
967de9a2 | 7 | smtpuser = r@bdr.sh |
19afe8a8 RBR |
8 | smtpencryption = ssl |
9 | smtpserverport = 465 | |
f853d479 | 10 | [core] |
2e62c7a1 | 11 | editor = nvim |
f853d479 BB |
12 | [color] |
13 | diff = auto | |
a40a5ec5 BB |
14 | [push] |
15 | default = simple | |
3422e7aa RBR |
16 | [pull] |
17 | rebase = false | |
0111fba8 BB |
18 | [commit] |
19 | gpgsign = true | |
19afe8a8 RBR |
20 | [init] |
21 | defaultBranch = main | |
2a55fbef | 22 | [diff] |
d2013186 | 23 | external = difft |
089ad2dd RBR |
24 | tool = vimdiff |
25 | [merge] | |
26 | tool = nvim | |
f30e0a60 | 27 | conflictstyle = zdiff3 |
089ad2dd RBR |
28 | [mergetool] |
29 | keepBackup = false | |
30 | [mergetool "nvim"] | |
31 | cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' |