Use difftastic for diffs

diff --git a/states/git/arch.sls b/states/git/arch.sls
index 1e11106a2ab1348400dc947e4f07a00b8c6b85fb..d28ab09b4eb4b494fa684e4433332283371f447a 100644 (file)
--- 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 9d03b7d686b03545c04ed876a1765219c58d836d..a4fe62e273d7b70ac5721a4197ee3ef55ac730f9 100644 (file)
--- 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',