From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Apr 2015 20:00:19 +0000 (-0700)
Subject: Merge branch 'nd/versioncmp-prereleases'
X-Git-Tag: v2.4.0~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b7990520bcac8ca1ade41ac61db80c5dcd0d821a?ds=inline;hp=-c

Merge branch 'nd/versioncmp-prereleases'

* nd/versioncmp-prereleases:
git tag: mention versionsort.prereleaseSuffix in manpage
---

b7990520bcac8ca1ade41ac61db80c5dcd0d821a
diff --combined Documentation/git-tag.txt
index bfba4ef078,0ce10ca4a7..f5b267e1e3
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@@ -98,10 -98,13 +98,13 @@@ OPTION
  --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. 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].
+ 	names are treated as versions). The "version:refname" sort
+ 	order can also be affected by the
+ 	"versionsort.prereleaseSuffix" configuration variable. Prepend
+ 	"-" to reverse sort 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::
@@@ -161,7 -164,7 +164,7 @@@ it in the repository configuration as f
  
  -------------------------------------
  [user]
 -    signingkey = <gpg-key-id>
 +    signingKey = <gpg-key-id>
  -------------------------------------