From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Mar 2015 23:02:27 +0000 (-0800)
Subject: Merge branch 'nd/grep-exclude-standard-help-fix'
X-Git-Tag: v2.4.0-rc0~60
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/a3eea73cc8370a3feeb9ca48ef88594d79c1ce9d?hp=34e4e05b5169ad0b94176aef188e7f704a75bd93

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
---

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")),