diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-17 04:22:50 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-17 04:22:50 +0400 |
| commit | 588c038ac690e012a00dcace34fb318449f5ec7c (patch) | |
| tree | d604d58fdb9d655e784d30b28b157e01eb289621 /builtin-grep.c | |
| parent | e75bf76f5462af4185d8260f6feecf24dd24a516 (diff) | |
| parent | 1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d (diff) | |
Merge branch 'sb/dashless'
* sb/dashless:
Make usage strings dash-less
t/: Use "test_must_fail git" instead of "! git"
t/test-lib.sh: exit with small negagive int is ok with test_must_fail
Conflicts:
builtin-blame.c
builtin-mailinfo.c
builtin-mailsplit.c
builtin-shortlog.c
git-am.sh
t/t4150-am.sh
t/t4200-rerere.sh
Diffstat (limited to 'builtin-grep.c')
| -rw-r--r-- | builtin-grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index 647535061c..7bf6a7156c 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>* <rev>* [-e] <pattern> [<path>...]"; static const char emsg_invalid_context_len[] = "%s: invalid context length argument"; |