diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-10 11:29:33 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-10 11:29:33 +0400 |
| commit | 179c94b24ae87e28328f9b311489417b66bd62c9 (patch) | |
| tree | 3458de6031a61992cf96700826c29096867cae43 /builtin-tag.c | |
| parent | 1d2375ddfee18bd3effd2c1f98527cc2f8b1df0a (diff) | |
| parent | abea85d1e9ee0bd77e41e934534aa5d5cdd0593a (diff) | |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
core-tutorial.txt: Fix showing the current behaviour.
git-archive: ignore prefix when checking file attribute
Fix documentation syntax of optional arguments in short options.
Diffstat (limited to 'builtin-tag.c')
| -rw-r--r-- | builtin-tag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-tag.c b/builtin-tag.c index 8dd959fe1c..129ff57f11 100644 --- a/builtin-tag.c +++ b/builtin-tag.c @@ -16,7 +16,7 @@ static const char * const git_tag_usage[] = { "git-tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]", "git-tag -d <tagname>...", - "git-tag -l [-n [<num>]] [<pattern>]", + "git-tag -l [-n[<num>]] [<pattern>]", "git-tag -v <tagname>...", NULL }; |