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
[rebase]
autosquash = true
+[pull]
+ rebase = false
+
[push]
- default = matching
+ default = upstream
followTags = true
[format]
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 ' \