From 43e017cc20242d34fba780685b07ee3d8e088a89 Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Tue, 29 Mar 2022 14:39:18 +0200 Subject: [PATCH] git: add difftastic as difftool --- .gitconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitconfig b/.gitconfig index 041e309..f13b88b 100644 --- a/.gitconfig +++ b/.gitconfig @@ -111,8 +111,18 @@ defaultBranch = main [lfs] concurrenttransfers = 32 + [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true + +[diff] + tool = difftastic + +[difftool] + prompt = false + +[difftool "difftastic"] + cmd = difft "$LOCAL" "$REMOTE"