[user] 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 [core] pager = delta editor = nvim [color] diff = auto [push] default = simple autoSetupRemote = true [pull] rebase = false [commit] gpgsign = true [init] defaultBranch = main [diff] external = difft tool = vimdiff algorithm = histogram [merge] tool = nvim conflictstyle = zdiff3 [mergetool] keepBackup = false [mergetool "nvim"] cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'