mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-28 12:34:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* jc/maint-grep-untracked-exclude:
  grep: fix the error message that mentions --exclude

Conflicts:
	builtin/grep.c
This commit is contained in:
Junio C Hamano 2011-10-15 20:26:52 -07:00
commit 9fddaf7896
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

@ -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();