From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Sat, 15 Oct 2011 18:36:22 +0000 (+0200)
Subject: grep: fix the error message that mentions --exclude
X-Git-Tag: v1.7.8-rc0~71^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=92e61831fb2c8d5b874405906510230fd0f10998;p=git-core%2Fgit.git

grep: fix the error message that mentions --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>
---

diff --git a/builtin-grep.c b/builtin-grep.c
index 2da6bc61b..45a23cfe6 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;