Skip to content

Commit 25268ad

Browse files
pcloudsgitster
authored andcommitted
config.txt: move versionsort.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 18b421d commit 25268ad

File tree

2 files changed

+34
-33
lines changed

2 files changed

+34
-33
lines changed

Documentation/config.txt

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -431,39 +431,7 @@ include::config/url.txt[]
431431

432432
include::config/user.txt[]
433433

434-
versionsort.prereleaseSuffix (deprecated)::
435-
Deprecated alias for `versionsort.suffix`. Ignored if
436-
`versionsort.suffix` is set.
437-
438-
versionsort.suffix::
439-
Even when version sort is used in linkgit:git-tag[1], tagnames
440-
with the same base version but different suffixes are still sorted
441-
lexicographically, resulting e.g. in prerelease tags appearing
442-
after the main release (e.g. "1.0-rc1" after "1.0"). This
443-
variable can be specified to determine the sorting order of tags
444-
with different suffixes.
445-
+
446-
By specifying a single suffix in this variable, any tagname containing
447-
that suffix will appear before the corresponding main release. E.g. if
448-
the variable is set to "-rc", then all "1.0-rcX" tags will appear before
449-
"1.0". If specified multiple times, once per suffix, then the order of
450-
suffixes in the configuration will determine the sorting order of tagnames
451-
with those suffixes. E.g. if "-pre" appears before "-rc" in the
452-
configuration, then all "1.0-preX" tags will be listed before any
453-
"1.0-rcX" tags. The placement of the main release tag relative to tags
454-
with various suffixes can be determined by specifying the empty suffix
455-
among those other suffixes. E.g. if the suffixes "-rc", "", "-ck" and
456-
"-bfs" appear in the configuration in this order, then all "v4.8-rcX" tags
457-
are listed first, followed by "v4.8", then "v4.8-ckX" and finally
458-
"v4.8-bfsX".
459-
+
460-
If more than one suffixes match the same tagname, then that tagname will
461-
be sorted according to the suffix which starts at the earliest position in
462-
the tagname. If more than one different matching suffixes start at
463-
that earliest position, then that tagname will be sorted according to the
464-
longest of those suffixes.
465-
The sorting order between different suffixes is undefined if they are
466-
in multiple config files.
434+
include::config/versionsort.txt[]
467435

468436
web.browser::
469437
Specify a web browser that may be used by some commands.

Documentation/config/versionsort.txt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
versionsort.prereleaseSuffix (deprecated)::
2+
Deprecated alias for `versionsort.suffix`. Ignored if
3+
`versionsort.suffix` is set.
4+
5+
versionsort.suffix::
6+
Even when version sort is used in linkgit:git-tag[1], tagnames
7+
with the same base version but different suffixes are still sorted
8+
lexicographically, resulting e.g. in prerelease tags appearing
9+
after the main release (e.g. "1.0-rc1" after "1.0"). This
10+
variable can be specified to determine the sorting order of tags
11+
with different suffixes.
12+
+
13+
By specifying a single suffix in this variable, any tagname containing
14+
that suffix will appear before the corresponding main release. E.g. if
15+
the variable is set to "-rc", then all "1.0-rcX" tags will appear before
16+
"1.0". If specified multiple times, once per suffix, then the order of
17+
suffixes in the configuration will determine the sorting order of tagnames
18+
with those suffixes. E.g. if "-pre" appears before "-rc" in the
19+
configuration, then all "1.0-preX" tags will be listed before any
20+
"1.0-rcX" tags. The placement of the main release tag relative to tags
21+
with various suffixes can be determined by specifying the empty suffix
22+
among those other suffixes. E.g. if the suffixes "-rc", "", "-ck" and
23+
"-bfs" appear in the configuration in this order, then all "v4.8-rcX" tags
24+
are listed first, followed by "v4.8", then "v4.8-ckX" and finally
25+
"v4.8-bfsX".
26+
+
27+
If more than one suffixes match the same tagname, then that tagname will
28+
be sorted according to the suffix which starts at the earliest position in
29+
the tagname. If more than one different matching suffixes start at
30+
that earliest position, then that tagname will be sorted according to the
31+
longest of those suffixes.
32+
The sorting order between different suffixes is undefined if they are
33+
in multiple config files.

0 commit comments

Comments
 (0)