forked from pub-solar/os
git: use delta for diffs
This commit is contained in:
parent
f45c7c2f50
commit
0b3a2f2954
|
@ -31,6 +31,7 @@ in {
|
|||
asciinema
|
||||
bat
|
||||
blesh
|
||||
delta
|
||||
eza
|
||||
fd
|
||||
jump
|
||||
|
|
|
@ -17,7 +17,25 @@ in
|
|||
smudge = git-lfs smudge -- %f
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
[core]
|
||||
pager = delta
|
||||
[interactive]
|
||||
diffFilter = delta --color-only
|
||||
[delta]
|
||||
navigate = true # use n and N to move between diff sections
|
||||
line-numbers = true
|
||||
syntax-theme = base16
|
||||
minus-style = "red dim"
|
||||
plus-style = "green dim"
|
||||
zero-style = "white dim"
|
||||
|
||||
# delta detects terminal colors automatically; set one of these to disable auto-detection
|
||||
# dark = true
|
||||
# light = true
|
||||
[merge]
|
||||
conflictstyle = diff3
|
||||
[diff]
|
||||
colorMoved = default
|
||||
[includeIf "gitdir:~/CodeRoom/greenbaum.cloud/"]
|
||||
path = ~/.config/git/config_greenbaum.cloud
|
||||
|
||||
|
|
Loading…
Reference in a new issue