diff --git a/config/git/attributes b/config/git/attributes new file mode 100644 index 0000000..b6fafc6 --- /dev/null +++ b/config/git/attributes @@ -0,0 +1,2 @@ +*.yml diff=dyff +*.yaml diff=dyff diff --git a/config/git/config b/config/git/config index ef134a4..f638d9a 100644 --- a/config/git/config +++ b/config/git/config @@ -46,6 +46,9 @@ [diff] colorMoved = true +[diff "dyff"] + command = "dyff_between() { dyff --color on between --omit-header \"$2\" \"$5\"; }; dyff_between" + [diff "gpg"] binary = true textconv = "gpg -qd --no-tty"