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

Merge branch 'maint-1.9' into maint-2.0

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

76f8611a5fb7e81c1bada0fb190d573a66fc03f6
diff --combined Documentation/git-tag.txt
index b424a1bc48,8c82b87c80..303de8eee5
--- 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
@@@ -95,12 -95,6 +95,12 @@@ OPTION
  	using fnmatch(3)).  Multiple patterns may be given; if any of
  	them matches, the tag is shown.
  
 +--sort=<type>::
 +	Sort in a specific order. Supported type is "refname"
 +	(lexicographic order), "version:refname" or "v:refname" (tag
 +	names are treated as versions). Prepend "-" to reverse sort
 +	order.
 +
  --column[=<options>]::
  --no-column::
  	Display tag listing in columns. See configuration variable