Merge branch 'nd/versioncmp-prereleases'

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

diff --combined Documentation/git-tag.txt
index bfba4ef078a916dd81782441b922b2059436164d,0ce10ca4a796632f9e50546b18af735bed7b545c..f5b267e1e300c965704ab3918fe16163351fd1cf
--- 1/Documentation/git-tag.txt
--- 2/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>
  -------------------------------------