Использование delta
This commit is contained in:
parent
109c8512a9
commit
dcb3a56107
@ -4,8 +4,19 @@
|
|||||||
|
|
||||||
[core]
|
[core]
|
||||||
editor = mcedit
|
editor = mcedit
|
||||||
pager = less -R
|
pager = delta
|
||||||
|
|
||||||
|
[interactive]
|
||||||
|
diffFilter = delta --color-only
|
||||||
|
|
||||||
|
[delta]
|
||||||
|
navigate = true # use n and N to move between diff sections
|
||||||
|
light = false # set to true if you're in a terminal w/ a light background color
|
||||||
|
side-by-side = true
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
tool = meld
|
tool = delta
|
||||||
|
conflictstyle = diff3
|
||||||
|
|
||||||
|
[diff]
|
||||||
|
colorMoved = default
|
||||||
|
Loading…
Reference in New Issue
Block a user