From 97ab0893168b81caeb0a2431d82f9dc0e57ba009 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Wed, 30 Mar 2022 18:44:43 +0200 Subject: [PATCH] [git] Enable diffing documents by default --- .install.conf.yaml | 1 + git/attributes | 12 ++++++++++++ git/config | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 git/attributes diff --git a/.install.conf.yaml b/.install.conf.yaml index 7c632c4..08bda0f 100644 --- a/.install.conf.yaml +++ b/.install.conf.yaml @@ -8,6 +8,7 @@ - link: ~/.bashrc: bash/bashrc ~/.bash_profile: bash/profile + ~/.config/git/attributes: git/attributes ~/.config/git/config: git/config ~/.config/git/ignore_global: git/ignore ~/.config/geany/keybindings.conf: geany/keybindings.conf diff --git a/git/attributes b/git/attributes new file mode 100644 index 0000000..3a225fe --- /dev/null +++ b/git/attributes @@ -0,0 +1,12 @@ +# Automatically normalize line endings for all text-based files +#* text=auto + +# Documents +*.doc diff=pandoc +*.DOC diff=pandoc +*.docx diff=pandoc +*.DOCX diff=pandoc +*.odt diff=pandoc +*.ODT diff=pandoc +*.pdf diff=pdf +*.PDF diff=pdf diff --git a/git/config b/git/config index 5a3c9e2..5e772ac 100644 --- a/git/config +++ b/git/config @@ -8,6 +8,7 @@ default = matching [core] excludesfile = ~/.config/git/ignore + attributesfile = ~/.config/git/attributes [color] ui = auto [color "status"] @@ -20,7 +21,7 @@ [diff] mnemonicPrefix = true tool = vimdiff -[diff "rst"] +[diff "pandoc"] textconv = pandoc --to=rst [diff "pdf"] textconv = pdf2txt