feature: git: Using delta as difftool

This also enables highlighting in the fzf-fish for git-related searches
This commit is contained in:
Ivan Golikov 2026-09-12 03:46:03 +02:00
parent ecde3dc29b
commit 6699bf3dcf
2 changed files with 14 additions and 13 deletions

View file

@ -5,25 +5,22 @@
[push]
default = current
[diff]
external = difft
tool = difftastic
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[pager]
difftool = true
[credential]
helper = cache --timeout=600
[core]
editor = nvim
autocrlf = input
pager = delta
[init]
defaultBranch = main
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
[merge]
conflictStyle = zdiff3