jonny/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve diffs by using the git-delta package

Browse source 
Also, switch the diffing to using `zdiff3` and the `histogram` algorithm
This commit is contained in:
Jonny Barnes 2022-02-27 09:08:17 +00:00
parent 2b7e099aaf
commit 873be7be01
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gitconfig
View file

@ -16,13 +16,13 @@
# Detect whitespace errors when applying a patch # Detect whitespace errors when applying a patch
whitespace = fix whitespace = fix
[color "diff-highlight"] #[color "diff-highlight"]
# Colours for `diff-so-fancy` # Colours for `diff-so-fancy`
oldNormal = "red bold" #oldNormal = "red bold"
oldHighlight = "red bold 52" #oldHighlight = "red bold 52"
newNormal = "green bold" #newNormal = "green bold"
newHighlight = "green bold 22" #newHighlight = "green bold 22"
[filter "lfs"] [filter "lfs"]
@ -41,8 +41,24 @@
# Automatically correct typos in commands # Automatically correct typos in commands
autoCorrect = prompt autoCorrect = prompt
[pager] #[pager]
# Make diff-so-fancy apply all the time # Make diff-so-fancy apply all the time
diff = "diff-so-fancy | less --tabs=4 -RFX" #diff = "diff-so-fancy | less --tabs=4 -RFX"
show = "diff-so-fancy | less --tabs=4 -RFX" #show = "diff-so-fancy | less --tabs=4 -RFX"
[core]
pager = delta
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
[merge]
conflictstyle = zdiff3
[diff]
algorithm = histogram
colorMoved = default