From f76f574e77b0c15c7959dca2b09b6a6814d3d907 Mon Sep 17 00:00:00 2001 From: Tobias Manske Date: Wed, 1 Jun 2022 19:08:36 +0200 Subject: [PATCH] Git: use dyff for yaml diffing --- .gitattributes | 3 +++ .gitconfig | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..720eb5f --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +*.* diff=delta +*.yml diff=dyff +*.yaml diff=dyff diff --git a/.gitconfig b/.gitconfig index 8c2636e..37bafd0 100644 --- a/.gitconfig +++ b/.gitconfig @@ -13,6 +13,7 @@ template = ~/.gitmessage [core] autocrlf = input + attributesFile = ~/.dotfiles/gitattributes pager = delta [github] user = rad4day @@ -32,3 +33,7 @@ protocol = https [credential] helper = store +[init] + defaultBranch = main +[diff "dyff"] + command = "dyff_between() { dyff --color on between --omit-header \"$2\" \"$5\"; }; dyff_between"