Replace diff-so-fancy by delta

This commit is contained in:
Yax 2026-07-19 10:32:45 +02:00
parent 80dadbced4
commit c4e61d2a65
2 changed files with 681 additions and 21 deletions

View file

@ -17,24 +17,8 @@
untrack = "!for BRANCH in $(git branch | grep -v '*'); do git branch -D \"${BRANCH}\"; done"
sync = "!git untrack && git gc && git f && git track"
[color]
ui = true
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = 11
frag = magenta bold
func = 146 bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
[core]
pager = diff-so-fancy | less --tabs=4 -RFX
pager = delta
autocrlf = input
[credential]
@ -43,18 +27,27 @@
helper = cache
[include]
path = ~/.config/delta/themes.gitconfig
path = ~/.gitconfig_custom.inc
[interactive]
diffFilter = diff-so-fancy --patch
diffFilter = delta --color-only
[delta]
features = arctic-fox
navigate = true # use n and N to move between diff sections
side-by-side = false
[merge]
conflictStyle = zdiff3
[pull]
rebase = true
rebase = true
[push]
default = current
[user]
email = {{ .git_email }}
name = {{ .git_alias }}
email = {{ .git_email }}
name = {{ .git_alias }}