summaryrefslogtreecommitdiff
path: root/lib/grep.zsh
diff options
context:
space:
mode:
authorBob Williams <bobwilliams.ii@gmail.com>2014-03-23 14:26:06 -0400
committerBob Williams <bobwilliams.ii@gmail.com>2014-03-23 14:26:06 -0400
commit1ca4e2146b7c99e5ec31cd7b8d8717ef2fea2f69 (patch)
tree9eccde279c8e3f450cfd447e391e12c81938e509 /lib/grep.zsh
parentd70e73294494e68c94879c7bf22f708a3049a9d4 (diff)
parent315099d7785bba4d3a99c8e0636d2fcd18360192 (diff)
downloadzsh-1ca4e2146b7c99e5ec31cd7b8d8717ef2fea2f69.tar.gz
zsh-1ca4e2146b7c99e5ec31cd7b8d8717ef2fea2f69.tar.bz2
zsh-1ca4e2146b7c99e5ec31cd7b8d8717ef2fea2f69.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'lib/grep.zsh')
-rw-r--r--lib/grep.zsh5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/grep.zsh b/lib/grep.zsh
index 25345bd06..977435ee4 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -8,5 +8,6 @@ GREP_OPTIONS=
for PATTERN in .cvs .git .hg .svn; do
GREP_OPTIONS+="--exclude-dir=$PATTERN "
done
-export GREP_OPTIONS+='--color=auto '
-export GREP_COLOR='1;32' \ No newline at end of file
+GREP_OPTIONS+="--color=auto"
+export GREP_OPTIONS="$GREP_OPTIONS"
+export GREP_COLOR='1;32'