diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-06 15:02:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-06 15:02:27 -0800 |
| commit | a3eea73cc8370a3feeb9ca48ef88594d79c1ce9d (patch) | |
| tree | df585bdd61cce1d5d5a1603dc333b7c90513e666 | |
| parent | 34e4e05b5169ad0b94176aef188e7f704a75bd93 (diff) | |
| parent | 77fdb8a82cc624bb3c720b87725abae4d0df5073 (diff) | |
| download | git-a3eea73cc8370a3feeb9ca48ef88594d79c1ce9d.tar.gz | |
Merge branch 'nd/grep-exclude-standard-help-fix'
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 9262b73b6f..335f25d0ad 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")), |