From 92e61831fb2c8d5b874405906510230fd0f10998 Mon Sep 17 00:00:00 2001
From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Sat, 15 Oct 2011 20:36:22 +0200
Subject: [PATCH] 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>
---
 builtin-grep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
2.11.4.GIT