summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-04-28 13:00:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-28 13:00:19 -0700
commitb7990520bcac8ca1ade41ac61db80c5dcd0d821a (patch)
tree51400e4f7aaf7025afef483b6619fe1c081a877d
parentMerge branch 'mg/status-v-v' (diff)
parentgit tag: mention versionsort.prereleaseSuffix in manpage (diff)
downloadtgif-b7990520bcac8ca1ade41ac61db80c5dcd0d821a.tar.xz
Merge branch 'nd/versioncmp-prereleases'
* nd/versioncmp-prereleases: git tag: mention versionsort.prereleaseSuffix in manpage
-rw-r--r--Documentation/git-tag.txt11
1 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index bfba4ef078..f5b267e1e3 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -98,10 +98,13 @@ OPTIONS
--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::