From 1c7c8cbf5560ae9e0e3cde0a565be219e288c0db Mon Sep 17 00:00:00 2001 From: Pierre Martin Date: Fri, 21 Jun 2024 05:31:42 +0200 Subject: [PATCH] feat(git): use difftastic by default --- packages.nix | 1 + programs/git.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/packages.nix b/packages.nix index 405fcde..cf43791 100644 --- a/packages.nix +++ b/packages.nix @@ -81,6 +81,7 @@ meld glab sapling + difftastic firefox vivaldi diff --git a/programs/git.nix b/programs/git.nix index c0f6e56..5419df9 100644 --- a/programs/git.nix +++ b/programs/git.nix @@ -37,6 +37,7 @@ diff.colorMoved = "default"; merge.tool = "meld"; + diff.external = "difft"; diff.algorithm = "patience"; pull.ff = "only"; credential.helper = "store";