.ssh/config-aether: Use old key-algo for callisto.adm.nynim.org

[dotfiles.git] / bin / diff-filter

diff --git a/bin/diff-filter b/bin/diff-filter
index dc8335831e9d05ee037ce7436c6e64676bf751e2..1cc13c95c871455627ab6e97df009cb28e44e7f9 100755 (executable)
--- a/bin/diff-filter
+++ b/bin/diff-filter
@@ -3,10 +3,13 @@
 
 # Use `diff-highlight` if available
 # Look for script in several expected locations
-for f in /usr/local/share/git-core/contrib/diff-highlight/diff-highlight \
-         /usr/share/git-core/contrib/diff-highlight/diff-highlight
+for f in \
+    $HOME/bin/diff-highlight \
+    /usr/local/share/git-core/contrib/diff-highlight/diff-highlight \
+    /usr/share/git-core/contrib/diff-highlight/diff-highlight
 do
     test -x $f && \
+        test -z $DIFFHIGHLIGHT_OFF && \
         tee | $f && \
         exit 0
 done