X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/66cffbdca48fa3388cee13d30ef105b94a22651b..8af9950cf8f948b36f023585242ac2e4f58107ac:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 17cf5ae..0ec6ed2 100644
--- 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,6 +43,9 @@
 [rebase]
 	autosquash = true
 
+[pull]
+	rebase = false
+
 [push]
 	default = upstream
 	followTags = true
@@ -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 ' \