From: Maximilian Friedersdorff Date: Wed, 30 Mar 2022 10:04:48 +0000 (+0100) Subject: Use difftastic for diffs X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=a04280dc5fddb6b5f4c3f0d4889b56f11e1f18b4;hp=fbcdc6ea427ceb68ea07e1063d1af5dea21bad01;p=max%2Fsaltfiles.git Use difftastic for diffs --- 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',