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