aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-07 13:41:03 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-07 13:41:03 -0700
commit325602ce120e7bd7321b9ed409b49b48fd20888e (patch)
treeea7a7b3ee6041766fa7151306e89c7b24ffcd862
parent565301e41670825ceedf75220f2918ae76831240 (diff)
parent3c2dc76f015b4d52ef02a08c59a4546d00b475e1 (diff)
downloadgit-325602ce120e7bd7321b9ed409b49b48fd20888e.tar.gz
git-325602ce120e7bd7321b9ed409b49b48fd20888e.tar.xz
Sync with maint
* maint: 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 320908369..e953ba443 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