Git: use dyff for yaml diffing

This commit is contained in:
Tobias Manske 2022-06-01 19:08:36 +02:00
parent 49bd6759b3
commit f76f574e77
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG Key ID: 202689A59D645C1C
2 changed files with 8 additions and 0 deletions

3
.gitattributes vendored Normal file
View File

@ -0,0 +1,3 @@
*.* diff=delta
*.yml diff=dyff
*.yaml diff=dyff

View File

@ -13,6 +13,7 @@
template = ~/.gitmessage template = ~/.gitmessage
[core] [core]
autocrlf = input autocrlf = input
attributesFile = ~/.dotfiles/gitattributes
pager = delta pager = delta
[github] [github]
user = rad4day user = rad4day
@ -32,3 +33,7 @@
protocol = https protocol = https
[credential] [credential]
helper = store helper = store
[init]
defaultBranch = main
[diff "dyff"]
command = "dyff_between() { dyff --color on between --omit-header \"$2\" \"$5\"; }; dyff_between"