From 028eac240fbcc851a9b679039f7119193164c470 Mon Sep 17 00:00:00 2001 From: Eric Teunis de Boone Date: Wed, 30 Mar 2022 18:12:24 +0200 Subject: [PATCH] [git] diff docx and odt using pandoc --- git/config | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git/config b/git/config index 7c31cc8..f1df4c1 100644 --- a/git/config +++ b/git/config @@ -6,8 +6,6 @@ editor = geany [push] default = matching -[diff "pdf"] - textconv = pdf2txt [core] excludesfile = ~/.config/git/ignore [color] @@ -17,7 +15,12 @@ [branch] autosetuprebase = always [diff] + mnemonicPrefix = true tool = vimdiff +[diff "rst"] + textconv = pandoc --to=rst +[diff "pdf"] + textconv = pdf2txt [alias] # Short Fancy Logs lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'