dot/gitconfig.in: Run `diff-highlight' from the path, if it's there.

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 9a55627..0ec6ed2 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -7,6 +7,9 @@
        attributesfile = @profile@/git/attributes
        whitespace = trailing-space,space-before-tab,indent-with-non-tab
 
+[advice]
+       ignoredHook = false
+
 [user]
        name = Mark Wooding
        email = mdw@distorted.org.uk
@@ -40,8 +43,11 @@
 [rebase]
        autosquash = true
 
+[pull]
+       rebase = false
+
 [push]
-       default = matching
+       default = upstream
        followTags = true
 
 [format]
@@ -84,9 +90,9 @@
        ui = auto column dense
 
 [pager]
-       log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager
-       show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager
-       diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager
+       diff = "if type >/dev/null 2>&1 diff-highlight; then diff-highlight; else cat; fi | mdw-pager"
+       log = "if type >/dev/null 2>&1 diff-highlight; then diff-highlight; else cat; fi | mdw-pager"
+       show = "if type >/dev/null 2>&1 diff-highlight; then diff-highlight; else cat; fi | mdw-pager"
 
 [alias]
        do = "!sh -e -c ' \