From 6d79aed2da940fa60c9568d4cf72851ddc0efef4 Mon Sep 17 00:00:00 2001
From: Anton Bobov <anton@bobov.name>
Date: Wed, 25 Oct 2023 19:18:14 +0500
Subject: [git] Add difftastic

---
 files/.eget.toml | 3 +++
 files/.gitconfig | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/files/.eget.toml b/files/.eget.toml
index ec709e4..9dd0be4 100644
--- a/files/.eget.toml
+++ b/files/.eget.toml
@@ -37,3 +37,6 @@ asset_filters = [ "up" ]
 
 ["mvdan/sh"]
 target = "~/.local/bin/shfmt"
+
+["Wilfred/difftastic"]
+asset_filters = [ "linux-gnu.tar.gz" ]
diff --git a/files/.gitconfig b/files/.gitconfig
index 3b3ca6a..4bffd82 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -24,6 +24,8 @@
   colorMoved = true
 [difftool]
   prompt = false
+[difftool "difftastic"]
+  cmd = difft --background=light --color=always "$LOCAL" "$REMOTE"
 [diff-so-fancy]
   stripLeadingSymbols = false
   markEmptyLines = false
@@ -52,6 +54,9 @@
   diffstat = diff --stat -r
   dc = diff --find-copies-harder --cached
   di = diff --find-copies-harder
+  dft = difftool --tool=difftastic
+  dshow = "!f() { GIT_EXTERNAL_DIFF=difft git show --ext-diff $@; }; f"
+  dlog = "!f() { GIT_EXTERNAL_DIFF=difft git log -p --ext-diff $@; }; f"
   fix = commit --amend -C HEAD
   history-all = "!gitk --all $( git fsck | awk '/dangling commit/ {print $3}'; git log -g --pretty='format:%H')"
   k =  !sh -c 'gitk $1' -
-- 
cgit v1.2.3