commit 87d501ef3520e16fa44553ff114b3485afda8146 (tree) parent 02cb8339e82db987df1058a9fb58b46f2379a7d6 Author: Motiejus Jakštys <motiejus@uber.com> Date: Sat, 23 Jan 2021 09:33:22 +0200 docx diffs Diffstat:
| M | .envrc | | | 11 | +++++++++-- |
| M | .gitattributes | | | 2 | ++ |
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.envrc b/.envrc @@ -1,5 +1,12 @@ PATH_add tools -if [ -z "$(git config diff.trustdb.textconv)" ]; then - git config diff.trustdb.textconv trustdbdiff +_trustdbdiff=trustdbdiff +_pandocdiff="pandoc -t plain" + +if [ "$(git config diff.trustdb.textconv)" != "$_trustdbdiff" ]; then + git config diff.trustdb.textconv "$_trustdbdiff" +fi + +if [ "$(git config diff.pandocdiff.textconv)" != "$_pandocdiff" ]; then + git config diff.pandocdiff.textconv "$_pandocdiff" fi diff --git a/.gitattributes b/.gitattributes @@ -1,4 +1,6 @@ # ssh id_ed25519 filter=git-crypt diff=git-crypt +# diffing binary blobs trustdb.gpg diff=trustdb +*.docx diff=pandocdiff