From 03c1f8621a3b6d57249e345beb3a2738dfad3cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chlo=C3=A9=20Vulquin?= Date: Sun, 21 Apr 2024 10:56:01 +0200 Subject: git: don't force external difft MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ok so this is a deep cut. The problem is that when you have diff.external set, it overrides *everything*. So if you want to have, for example, a textconv diff filter… you just can't do that. Even passing --no-ext is questionable. Instead, just require the use of `dt` / --ext-diff. It's tragic :( --- dot_config/git/difftastic.config | 1 - 1 file changed, 1 deletion(-) (limited to 'dot_config/git') diff --git a/dot_config/git/difftastic.config b/dot_config/git/difftastic.config index 9772838..29bb489 100644 --- a/dot_config/git/difftastic.config +++ b/dot_config/git/difftastic.config @@ -1,6 +1,5 @@ # vim: ft=gitconfig [diff] - external = difft tool = difftastic [difftool] prompt = false -- cgit v1.2.3