Merge branch 'ak/t5516-typofix' into maint

diff --git a/builtin/grep.c b/builtin/grep.c
index 4063882f06536ad5b3f1292a5b66e534ad4688af..e77f7cf109a02a10b2f38132b1a169b43d3c11d9 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")),