summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2015-03-10 17:16:35 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-10 13:51:48 -0700
commit5751a3d1954cd2e362ba1ca9625acdc8c5185a25 (patch)
treed5e2f0e776caa92247e5a49f21a625b1d165fdb4 /Documentation/config.txt
parentversionsort: support reorder prerelease suffixes (diff)
downloadtgif-5751a3d1954cd2e362ba1ca9625acdc8c5185a25.tar.xz
config.txt: update versioncmp.prereleaseSuffix
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt9
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 69a73458c3..fe8705dcef 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2527,8 +2527,13 @@ versionsort.prereleaseSuffix::
When version sort is used in linkgit:git-tag[1], prerelease
tags (e.g. "1.0-rc1") may appear after the main release
"1.0". By specifying the suffix "-rc" in this variable,
- "1.0-rc1" will appear before "1.0". One variable assignment
- per suffix.
+ "1.0-rc1" will appear before "1.0".
++
+This variable can be specified multiple times, once per suffix. The
+order of suffixes in the config file determines the sorting order
+(e.g. if "-pre" appears before "-rc" in the config file then 1.0-preXX
+is sorted before 1.0-rcXX). The sorting order between different
+suffixes is undefined if they are in multiple config files.
web.browser::
Specify a web browser that may be used by some commands.