diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:26:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:26:52 -0700 |
| commit | 9fddaf78964a835160a0b27cdac724c27aab09bf (patch) | |
| tree | bc7d01f3fc383385b11f8931beaf2a114eab9620 /builtin/grep.c | |
| parent | dbfae86a7b0bf9f9a4f37dbc916e8d26a5f9d51c (diff) | |
| parent | 92e61831fb2c8d5b874405906510230fd0f10998 (diff) | |
| download | git-9fddaf78964a835160a0b27cdac724c27aab09bf.tar.gz | |
Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude
* jc/maint-grep-untracked-exclude:
grep: fix the error message that mentions --exclude
Conflicts:
builtin/grep.c
Diffstat (limited to 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 5e6d3c3352..14b05a43bc 100644 --- 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(); |