]> git.r.bdr.sh - rbdr/dotfiles/blame - gitconfig
Add laptop switch config
[rbdr/dotfiles] / gitconfig
CommitLineData
f853d479 1[user]
04b083ae
RBR
2 name = Ruben Beltran del Rio
3 email = git@r.bdr.sh
d78367b1 4 signingkey = ~/.ssh/git.pub
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
d78367b1
RBR
22[gpg]
23 format = ssh
19afe8a8 24[init]
04b083ae 25 defaultBranch = main
2a55fbef 26[diff]
d2013186 27 external = difft
04b083ae
RBR
28 tool = vimdiff
29 algorithm = histogram
089ad2dd
RBR
30[merge]
31 tool = nvim
f30e0a60 32 conflictstyle = zdiff3
089ad2dd
RBR
33[mergetool]
34 keepBackup = false
35[mergetool "nvim"]
36 cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'