aboutsummaryrefslogtreecommitdiff
path: root/gitconfig
blob: 4c9ba6840abc69a40c327ded120564c0aae2bf7a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
[user]
  name = Ruben Beltran del Rio
  email = git@r.bdr.sh
  signingkey = ~/.ssh/git.pub
[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
[gpg]
  format = ssh
[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'