Andrew's git / gitweb.git / diff
?
Merge branch 'nd/grep-exclude-standard-help-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2015 23:02:27 +0000 (15:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2015 23:02:27 +0000 (15:02 -0800)
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

builtin/grep.c patch | blob | history
diff --git a/builtin/grep.c b/builtin/grep.c
index 9262b73b6f5efd28756db221f2775671430c7fd2..335f25d0ad69a41ee2ea1e1e38aecbc2c121cb8c 100644 (file)
--- 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")),