diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:06 -0700 |
| commit | 2408f3b74b26580b9f197e4edd96e73b0fba41c5 (patch) | |
| tree | 0c2bc2fc409ba0733ca8fd4b49df121f57fbe688 | |
| parent | 3af1bcafffb0d462abf6208574059f72ce4d5b48 (diff) | |
| parent | 77fdb8a82cc624bb3c720b87725abae4d0df5073 (diff) | |
| download | git-2408f3b74b26580b9f197e4edd96e73b0fba41c5.tar.gz | |
Merge branch 'nd/grep-exclude-standard-help-fix' into maint
Description given by "grep -h" for its --exclude-standard option
was phrased poorly.
* nd/grep-exclude-standard-help-fix:
grep: correct help string for --exclude-standard
| -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 4063882f06..e77f7cf109 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -641,7 +641,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "untracked", &untracked, N_("search in both tracked and untracked files")), OPT_SET_INT(0, "exclude-standard", &opt_exclude, - N_("search also in ignored files"), 1), + N_("ignore files specified via '.gitignore'"), 1), OPT_GROUP(""), OPT_BOOL('v', "invert-match", &opt.invert, N_("show non-matching lines")), |