diff options
Diffstat (limited to 'config/git')
| -rw-r--r-- | config/git/config | 36 | ||||
| -rw-r--r-- | config/git/ignore | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/config/git/config b/config/git/config new file mode 100644 index 0000000..4c9ba68 --- /dev/null +++ b/config/git/config @@ -0,0 +1,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' diff --git a/config/git/ignore b/config/git/ignore new file mode 100644 index 0000000..66d62f8 --- /dev/null +++ b/config/git/ignore @@ -0,0 +1 @@ +**/.claude/settings.local.json |