git.r.bdr.sh - rbdr/dotfiles/blob - gitconfig

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