author | Junio C Hamano <gitster@pobox.com> | |
Sun, 16 Oct 2011 03:26:52 +0000 (20:26 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 16 Oct 2011 03:26:52 +0000 (20:26 -0700) |
* jc/maint-grep-untracked-exclude:
grep: fix the error message that mentions --exclude
Conflicts:
builtin/grep.c
grep: fix the error message that mentions --exclude
Conflicts:
builtin/grep.c
builtin/grep.c | patch | blob | history |
diff --git a/builtin/grep.c b/builtin/grep.c
index 5e6d3c335224ce5acb38c9aea8bee30b04ea09e2..14b05a43bcc98f0e0ccb1bf1ca8f219a4a01fe61 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
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();