mirror of
https://github.com/kristoferssolo/solorice.git
synced 2026-03-18 08:09:40 +00:00
Update 2026-02-09
This commit is contained in:
@@ -62,27 +62,30 @@
|
||||
# a matter of taste (uncomment if you dare)
|
||||
|
||||
[core]
|
||||
# fsmonitor = true
|
||||
# untrackedCache = true
|
||||
# fsmonitor = true
|
||||
# untrackedCache = true
|
||||
[merge]
|
||||
# (just 'diff3' if git version < 2.3)
|
||||
conflictstyle = zdiff3
|
||||
# (just 'diff3' if git version < 2.3)
|
||||
conflictstyle = zdiff3
|
||||
[pull]
|
||||
# rebase = true
|
||||
[log]
|
||||
abbrevCommit = true
|
||||
graphColors = blue, yellow,cyan,magenta,green,red
|
||||
|
||||
|
||||
[pager]
|
||||
diff = diff-so-fancy | less --tabs=4 -RF
|
||||
diff = delta
|
||||
branch = false
|
||||
tag = false
|
||||
|
||||
[interactive]
|
||||
diffFilter = diff-so-fancy --patch
|
||||
diffFilter = delta --color-only
|
||||
singlekey = true
|
||||
|
||||
[delta]
|
||||
navigate = true # use n and N to move between diff sections
|
||||
dark = true # or light = true, or omit for auto-detection
|
||||
|
||||
[diff-so-fancy]
|
||||
markEmptyLines = false
|
||||
|
||||
|
||||
Reference in New Issue
Block a user