summaryrefslogtreecommitdiff
path: root/builtin/grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-06 23:02:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-06 23:02:27 (GMT)
commita3eea73cc8370a3feeb9ca48ef88594d79c1ce9d (patch)
treedf585bdd61cce1d5d5a1603dc333b7c90513e666 /builtin/grep.c
parent34e4e05b5169ad0b94176aef188e7f704a75bd93 (diff)
parent77fdb8a82cc624bb3c720b87725abae4d0df5073 (diff)
downloadgit-a3eea73cc8370a3feeb9ca48ef88594d79c1ce9d.zip
git-a3eea73cc8370a3feeb9ca48ef88594d79c1ce9d.tar.gz
git-a3eea73cc8370a3feeb9ca48ef88594d79c1ce9d.tar.bz2
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
Diffstat (limited to 'builtin/grep.c')
-rw-r--r--builtin/grep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c
index 9262b73..335f25d 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")),