summaryrefslogtreecommitdiff
path: root/builtin-grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-20 17:16:29 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-20 17:16:29 -0700
commitfa4946b5532ff911565c882892a715616c22cdec (patch)
treed6c503fcee7de1794ae552760ad313501714dad1 /builtin-grep.c
parent107cee507884dc9b3c5d3759e8e50c9c47e2ddcd (diff)
parent2d9c572578c72bd6691e80a9feed7d631baf007f (diff)
downloadgit-fa4946b5532ff911565c882892a715616c22cdec.tar.gz
Merge branch 'maint'
* maint: fix usage string for git grep refresh-index: fix bitmask assignment Conflicts: builtin-grep.c
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 7bf6a7156c..631129ddfd 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -498,7 +498,7 @@ static int grep_object(struct grep_opt *opt, const char **paths,
}
static const char builtin_grep_usage[] =
-"git grep <option>* <rev>* [-e] <pattern> [<path>...]";
+"git grep <option>* [-e] <pattern> <rev>* [[--] <path>...]";
static const char emsg_invalid_context_len[] =
"%s: invalid context length argument";