Merge branch 'nd/versioncmp-prereleases'

* nd/versioncmp-prereleases:
  git tag: mention versionsort.prereleaseSuffix in manpage
This commit is contained in:
Junio C Hamano 2015-04-28 13:00:19 -07:00
commit b7990520bc

View File

@ -98,10 +98,13 @@ OPTIONS
--sort=<type>:: --sort=<type>::
Sort in a specific order. Supported type is "refname" Sort in a specific order. Supported type is "refname"
(lexicographic order), "version:refname" or "v:refname" (tag (lexicographic order), "version:refname" or "v:refname" (tag
names are treated as versions). Prepend "-" to reverse sort names are treated as versions). The "version:refname" sort
order. When this option is not given, the sort order defaults to the order can also be affected by the
value configured for the 'tag.sort' variable if it exists, or "versionsort.prereleaseSuffix" configuration variable. Prepend
lexicographic order otherwise. See linkgit:git-config[1]. "-" 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>]:: --column[=<options>]::
--no-column:: --no-column::