1ca4e2146b7c99e5ec31cd7b8d8717ef2fea2f69

Author
Bob Williams <bobwilliams.ii@gmail.com>
Committer
Bob Williams <bobwilliams.ii@gmail.com>
Date

Message

Merge remote-tracking branch 'upstream/master'

Diff

 1diff --git a/lib/grep.zsh b/lib/grep.zsh
 2index 25345bd0688d8e0d2295b4620e87d428f0a528c7..977435ee4041424f24efa25d3531697f4a706adf 100644
 3--- a/lib/grep.zsh
 4+++ b/lib/grep.zsh
 5@@ -8,5 +8,6 @@ GREP_OPTIONS=
 6 for PATTERN in .cvs .git .hg .svn; do
 7     GREP_OPTIONS+="--exclude-dir=$PATTERN "
 8 done
 9-export GREP_OPTIONS+='--color=auto '
10-export GREP_COLOR='1;32'
11+GREP_OPTIONS+="--color=auto"
12+export GREP_OPTIONS="$GREP_OPTIONS"
13+export GREP_COLOR='1;32'