Merge branch 'maint-1.9' into maint-2.0

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

diff --combined Documentation/git-tag.txt
index b424a1bc48bba96513da17ee63bee4383453c3b4,8c82b87c8026ed6531e55708be3577144932075b..303de8eee55be473b3e76abde6373391c5a80fdf
--- 1/Documentation/git-tag.txt
--- 2/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