kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jc/grep-untracked-exclude' 

* jc/grep-untracked-exclude:
  grep: fix the error message that mentions --exclude
maint
Junio C Hamano 2011-10-15 20:27:19 -07:00
parent 463b0ea22b 9fddaf7896
commit efe7aecbce
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/grep.c
View File

@ -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.")); die(_("--no-index or --untracked cannot be used with revs."));
hit = grep_directory(&opt, &pathspec, use_exclude); hit = grep_directory(&opt, &pathspec, use_exclude);
} else if (0 <= opt_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) { } else if (!list.nr) {
if (!cached) if (!cached)
setup_work_tree(); setup_work_tree();