Merge branch 'master' into fairchild

* master:
  dot/zshrc: Some other tweaks.
  dot/zshrc: Use `hist_ignore_space' instead of the `zshaddhistory' hack.
  dot/bashrc, dot/zshrc: Turn on `!' expansion explicitly.

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 2bbe46482054ca90bd6f2756ae1f07dc1bb85dad..9b9617767963eabe1f59cc96f03a9f7c1d8e8f9c 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -79,9 +79,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"