summaryrefslogtreecommitdiff
path: root/lib/grep.zsh
diff options
context:
space:
mode:
authorAndrew Janke <andrew@apjanke.net>2015-09-28 08:52:03 -0400
committerAndrew Janke <andrew@apjanke.net>2015-09-28 08:52:03 -0400
commite4fdb083655fc582ebcecb07cd1bd1130077f0e4 (patch)
treefee07d9adfee79d1c88206ead154a23520ac51cb /lib/grep.zsh
parent5c8b0cc0c1782b34790548498018fb9e0300992b (diff)
parentb05ef1034fffd7b0c29f1558a8a357ccce7ae74b (diff)
downloadzsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.tar.gz
zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.tar.bz2
zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.zip
Merge branch 'master' into copyfile-portability
Diffstat (limited to 'lib/grep.zsh')
-rw-r--r--lib/grep.zsh2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/grep.zsh b/lib/grep.zsh
index 3fa103d19..abc1650a1 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -11,7 +11,7 @@ if grep-flag-available --color=auto; then
fi
# ignore VCS folders (if the necessary grep flags are available)
-VCS_FOLDERS="{.bzr,.cvs,.git,.hg,.svn}"
+VCS_FOLDERS="{.bzr,CVS,.git,.hg,.svn}"
if grep-flag-available --exclude-dir=.cvs; then
GREP_OPTIONS+=" --exclude-dir=$VCS_FOLDERS"