Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude

gitster · gitster · commit 9fddaf78964a · 2011-10-15T20:26:52.000-07:00
* jc/maint-grep-untracked-exclude:
  grep: fix the error message that mentions --exclude

Conflicts:
	builtin/grep.c
diff --git a/builtin/grep.c b/builtin/grep.c
@@ -1061,7 +1061,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();
