Configure YAML diff with homeport/dyff
This commit is contained in:
parent
c968e97fa6
commit
6023d60549
2 changed files with 5 additions and 0 deletions
2
config/git/attributes
Normal file
2
config/git/attributes
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
*.yml diff=dyff
|
||||||
|
*.yaml diff=dyff
|
|
@ -46,6 +46,9 @@
|
||||||
[diff]
|
[diff]
|
||||||
colorMoved = true
|
colorMoved = true
|
||||||
|
|
||||||
|
[diff "dyff"]
|
||||||
|
command = "dyff_between() { dyff --color on between --omit-header \"$2\" \"$5\"; }; dyff_between"
|
||||||
|
|
||||||
[diff "gpg"]
|
[diff "gpg"]
|
||||||
binary = true
|
binary = true
|
||||||
textconv = "gpg -qd --no-tty"
|
textconv = "gpg -qd --no-tty"
|
||||||
|
|
Loading…
Reference in a new issue