From a04280dc5fddb6b5f4c3f0d4889b56f11e1f18b4 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Wed, 30 Mar 2022 11:04:48 +0100 Subject: [PATCH] Use difftastic for diffs --- states/git/arch.sls | 1 + states/git/init.sls | 1 + 2 files changed, 2 insertions(+) diff --git a/states/git/arch.sls b/states/git/arch.sls index 1e11106..d28ab09 100644 --- a/states/git/arch.sls +++ b/states/git/arch.sls @@ -1,3 +1,4 @@ install git: pkg.installed: - name: git + - name: difftastic diff --git a/states/git/init.sls b/states/git/init.sls index 9d03b7d..a4fe62e 100644 --- a/states/git/init.sls +++ b/states/git/init.sls @@ -8,6 +8,7 @@ include: 'color.status': 'always', 'color.interactive': 'always', 'color.diff': 'true', + 'diff.external': 'difft', 'user.name': 'Maximilian Friedersdorff', 'user.email': 'max@friedersdorff.com', 'user.signingkey': 'F5E7FCB3', -- 2.47.1