summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert Wesarg <bert.wesarg@googlemail.com>2011-10-15 20:36:22 +0200
committerJunio C Hamano <gitster@pobox.com>2011-10-15 20:25:21 -0700
commit92e61831fb2c8d5b874405906510230fd0f10998 (patch)
treec68d51f31cebda46132dc114eddeb72c56d39cfe
parent0a93fb8a9cc6fa1bf7dba6b498cba3f57f5017a1 (diff)
downloadgit-jc/maint-grep-untracked-exclude.tar.gz
grep: fix the error message that mentions --excludejc/maint-grep-untracked-exclude
Missing rename from --exclude to --standard-exclude. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-grep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-grep.c b/builtin-grep.c
index 2da6bc61b6..45a23cfe64 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -971,7 +971,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
}
if (0 <= opt_exclude)
- die("--exclude or --no-exclude cannot be used for tracked contents.");
+ die("--[no-]exclude-standard cannot be used for tracked contents.");
if (!list.nr) {
int hit;