From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 Oct 2011 03:27:19 +0000 (-0700)
Subject: Merge branch 'jc/grep-untracked-exclude'
X-Git-Tag: v1.7.8-rc0~71
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/efe7aecbceb7ce0ea61f320dfbfb9e8e23f60de6?hp=463b0ea22b5b9a882e8140d0308433d8cbd0d1fe

Merge branch 'jc/grep-untracked-exclude'

* jc/grep-untracked-exclude:
grep: fix the error message that mentions --exclude
---

diff --git a/builtin/grep.c b/builtin/grep.c
index 024b87868a..7d0779f6cf 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -1064,7 +1064,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 			die(_("--no-index or --untracked cannot be used with revs."));
 		hit = grep_directory(&opt, &pathspec, use_exclude);
 	} else 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."));
 	} else if (!list.nr) {
 		if (!cached)
 			setup_work_tree();