summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-07 20:40:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-07 20:40:51 (GMT)
commit3c2dc76f015b4d52ef02a08c59a4546d00b475e1 (patch)
tree5ad1220b92c71894cfb1aed3971bb84f1d72d63f
parentb6e8269e9ba131b6ea6a10088be139dc89704fb6 (diff)
parent76f8611a5fb7e81c1bada0fb190d573a66fc03f6 (diff)
downloadgit-3c2dc76f015b4d52ef02a08c59a4546d00b475e1.zip
git-3c2dc76f015b4d52ef02a08c59a4546d00b475e1.tar.gz
git-3c2dc76f015b4d52ef02a08c59a4546d00b475e1.tar.bz2
Merge branch 'maint-2.0' into maint
* maint-2.0: git-tag.txt: Add a missing hyphen to `-s`
-rw-r--r--Documentation/git-tag.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 3209083..e953ba4 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