diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-07 13:40:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-07 13:40:19 -0700 |
| commit | 9181365b856a63f8c5486ad0fe48f1cd60852da3 (patch) | |
| tree | d63ffbda006ba157679e7e25e0f2e331ad9897a0 | |
| parent | d31f3ad23dd1aee3c3e1015a43b02b995c01a9a1 (diff) | |
| parent | eeff891ac756fd97a05476446f15269b714ce4cc (diff) | |
| download | git-9181365b856a63f8c5486ad0fe48f1cd60852da3.tar.gz | |
Merge branch 'maint-1.8.5' into maint-1.9
* maint-1.8.5:
git-tag.txt: Add a missing hyphen to `-s`
| -rw-r--r-- | Documentation/git-tag.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 404257df9f..8c82b87c80 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -42,7 +42,7 @@ committer identity for the current user is used to find the GnuPG key for signing. The configuration variable `gpg.program` is used to specify custom GnuPG binary. -Tag objects (created with `-a`, `s`, or `-u`) are called "annotated" +Tag objects (created with `-a`, `-s`, or `-u`) are called "annotated" tags; they contain a creation date, the tagger name and e-mail, a tagging message, and an optional GnuPG signature. Whereas a "lightweight" tag is simply a name for an object (usually a commit |