diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-07 13:40:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-07 13:40:39 -0700 |
| commit | 76f8611a5fb7e81c1bada0fb190d573a66fc03f6 (patch) | |
| tree | 906ba44b1f2bd0925f89659e3279b6f03d9a6e3f /Documentation | |
| parent | 32f56600bb6ac6fc57183e79d2c1515dfa56672f (diff) | |
| parent | 9181365b856a63f8c5486ad0fe48f1cd60852da3 (diff) | |
| download | git-76f8611a5fb7e81c1bada0fb190d573a66fc03f6.tar.gz | |
Merge branch 'maint-1.9' into maint-2.0
* maint-1.9:
git-tag.txt: Add a missing hyphen to `-s`
Diffstat (limited to 'Documentation')
| -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 b424a1bc48..303de8eee5 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 |