diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-04-10 00:29:33 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-04-10 00:29:33 -0700 |
commit | 179c94b24ae87e28328f9b311489417b66bd62c9 (patch) | |
tree | 3458de6031a61992cf96700826c29096867cae43 /Documentation/git-tag.txt | |
parent | 1d2375ddfee18bd3effd2c1f98527cc2f8b1df0a (diff) | |
parent | abea85d1e9ee0bd77e41e934534aa5d5cdd0593a (diff) | |
download | git-179c94b24ae87e28328f9b311489417b66bd62c9.tar.gz git-179c94b24ae87e28328f9b311489417b66bd62c9.tar.xz |
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 'Documentation/git-tag.txt')
-rw-r--r-- | Documentation/git-tag.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index c22fb7117..4b6fd90ea 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git-tag' [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <name> [<head>] 'git-tag' -d <name>... -'git-tag' [-n [<num>]] -l [<pattern>] +'git-tag' [-n[<num>]] -l [<pattern>] 'git-tag' -v <name>... DESCRIPTION @@ -57,7 +57,7 @@ OPTIONS -v:: Verify the gpg signature of the given tag names. --n <num>:: +-n<num>:: <num> specifies how many lines from the annotation, if any, are printed when using -l. The default is not to print any annotation lines. |