Merge branch 'master' into fairchild

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 0bc63d1c87e3f36861973d3a09557ae7fc96f6ad..369c091acc051e50501d4bb27a6b227e25a744d0 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -82,9 +82,9 @@
        external = --color=always
 
 [pager]
-       log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
-       show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
-       diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
+       ##log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
+       ##show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
+       ##diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
 
 [alias]
        egrep = "grep -E"