Compare commits

..

2 Commits

2 changed files with 16 additions and 18 deletions

View File

@ -0,0 +1 @@
return { "sindrets/diffview.nvim" }

View File

@ -1,29 +1,26 @@
[user] [user]
name = Ryan Cavicchioni name = Ryan Cavicchioni
email = ryan@cavi.cc email = ryan@cavi.cc
signingkey = /home/ryan/.ssh/id_ed25519.pub
[color] [color]
ui = true ui = true
[push] [push]
default = simple default = simple
[commit] [commit]
gpgsign = true gpgsign = true
[log] [pull]
showsignature = true ff = only
[core] [gpg]
pager = delta format = ssh
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
# delta detects terminal colors automatically; set one of these to disable auto-detection
# dark = true
# light = true
[merge] [merge]
conflictstyle = diff3 conflictstyle = zdiff3
[log]
showSignature = true
[gpg "ssh"]
allowedSignersFile = /home/ryan/.ssh/allowed_signers
[diff] [diff]
colorMoved = default tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"