diff --git a/gitconfig b/gitconfig
index 166a840..9afc7d4 100644
--- a/gitconfig
+++ b/gitconfig
@@ -23,7 +23,6 @@
 [commit]
     verbose = true
 [diff]
-    external = difft
     algorithm = histogram
     mnemonicprefix = true
     renames = copies
diff --git a/zshrc b/zshrc
index fe822fc..990fb37 100755
--- a/zshrc
+++ b/zshrc
@@ -85,6 +85,10 @@ else
     export VISUAL="vi"
 fi
 
+if is_interactive && command_exists difft; then
+    export GIT_EXTERNAL_DIFF="difft"
+fi
+
 if mac; then
     # Don't pollute tar archives with ._ files (Apple double files)
     export COPYFILE_DISABLE=true