diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:27:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:27:19 -0700 |
| commit | efe7aecbceb7ce0ea61f320dfbfb9e8e23f60de6 (patch) | |
| tree | b5dbd971fb71c05179a3d1eedacc32be84eb740a /builtin | |
| parent | send-email: Fix %config_path_settings handling (diff) | |
| parent | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude (diff) | |
| download | tgif-efe7aecbceb7ce0ea61f320dfbfb9e8e23f60de6.tar.xz | |
Merge branch 'jc/grep-untracked-exclude'
* jc/grep-untracked-exclude:
grep: fix the error message that mentions --exclude
Diffstat (limited to 'builtin')
| -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 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(); |