Форматирование
This commit is contained in:
parent
a33de8d1df
commit
2a18787238
@ -1,22 +1,22 @@
|
|||||||
[user]
|
[user]
|
||||||
name = John Doe
|
name = John Doe
|
||||||
email = john@doe.com
|
email = john@doe.com
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
editor = mcedit
|
editor = mcedit
|
||||||
pager = delta
|
pager = delta
|
||||||
|
|
||||||
[interactive]
|
[interactive]
|
||||||
diffFilter = delta --color-only
|
diffFilter = delta --color-only
|
||||||
|
|
||||||
[delta]
|
[delta]
|
||||||
navigate = true # use n and N to move between diff sections
|
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
|
light = false # set to true if you're in a terminal w/ a light background color
|
||||||
side-by-side = true
|
side-by-side = true
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
tool = delta
|
tool = delta
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
colorMoved = default
|
colorMoved = default
|
||||||
|
Loading…
x
Reference in New Issue
Block a user