From c73a42098882ab56b3d4748a3c9625c78135d6bb Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Mon, 16 Jan 2023 15:43:11 +0200 Subject: git: only use difftastic with "git difftool" Sometimes I want the raw diff and this seems like an easy way to achieve that. Sponsored-by: author --- gitconfig-exolobe1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gitconfig-exolobe1') diff --git a/gitconfig-exolobe1 b/gitconfig-exolobe1 index c30661d..833d4da 100644 --- a/gitconfig-exolobe1 +++ b/gitconfig-exolobe1 @@ -48,7 +48,13 @@ diffFilter = delta --color-only --features=interactive [diff] - external = difft + tool = difftastic + +[difftool] + prompt = false + +[difftool "difftastic"] + cmd = difft "$LOCAL" "$REMOTE" [includeIf "gitdir:~/UpCloud/"] path = ~/liw-dot-files/gitconfig-upcloud -- cgit v1.2.1