From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 7 Oct 2014 20:40:51 +0000 (-0700)
Subject: Merge branch 'maint-2.0' into maint
X-Git-Tag: v2.1.3~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3c2dc76f015b4d52ef02a08c59a4546d00b475e1?hp=-c

Merge branch 'maint-2.0' into maint

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

3c2dc76f015b4d52ef02a08c59a4546d00b475e1
diff --combined Documentation/git-tag.txt
index 320908369f,303de8eee5..e953ba4439
--- 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
@@@ -99,9 -99,7 +99,9 @@@ OPTION
  	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.
 +	order. When this option is not given, the sort order defaults to the
 +	value configured for the 'tag.sort' variable if it exists, or
 +	lexicographic order otherwise. See linkgit:git-config[1].
  
  --column[=<options>]::
  --no-column::
@@@ -319,7 -317,6 +319,7 @@@ include::date-formats.txt[
  SEE ALSO
  --------
  linkgit:git-check-ref-format[1].
 +linkgit:git-config[1].
  
  GIT
  ---