From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 7 Oct 2014 20:40:19 +0000 (-0700)
Subject: Merge branch 'maint-1.8.5' into maint-1.9
X-Git-Tag: v2.0.5~2^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9181365b856a63f8c5486ad0fe48f1cd60852da3?ds=inline;hp=-c

Merge branch 'maint-1.8.5' into maint-1.9

* maint-1.8.5:
git-tag.txt: Add a missing hyphen to `-s`
---

9181365b856a63f8c5486ad0fe48f1cd60852da3
diff --combined Documentation/git-tag.txt
index 404257df9f,a82d2e27bd..8c82b87c80
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@@ -42,7 -42,7 +42,7 @@@ committer identity for the current use
  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
@@@ -103,9 -103,8 +103,9 @@@ OPTION
  +
  This option is only applicable when listing tags without annotation lines.
  
 ---contains <commit>::
 -	Only list tags which contain the specified commit.
 +--contains [<commit>]::
 +	Only list tags which contain the specified commit (HEAD if not
 +	specified).
  
  --points-at <object>::
  	Only list tags of the given object.