feat: add delta diff viewer

This commit is contained in:
Stefan Imhoff
2022-10-01 19:21:36 +02:00
parent a7a262222c
commit ecbb5e77e6
3 changed files with 16 additions and 3 deletions

View File

@@ -9,6 +9,16 @@
excludesfile = ~/.gitignore
legacyheaders = false
whitespace = trailing-space,space-before-tab
pager = delta
[interactive]
diffFilter = delta --color-only
[add.interactive]
useBuildtin = false
[delta]
navigate = true
light = false
line-numbers = true
syntax-theme = Dracula
[alias]
st = status
ci = commit
@@ -62,11 +72,13 @@
[diff]
tool = Kaleidoscope
algorithm = patience
colorMoved = default
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[merge]
conflictstyle = diff3
tool = Kaleidoscope
[mergetool]
prompt = false