diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-20 13:11:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 13:11:45 -0700 |
| commit | f57610a1ff7a547d1e11e24f942b1703cea81f81 (patch) | |
| tree | b1157b51c682216794a750556aae362830ade856 /Documentation | |
| parent | Post 2.3 cyce (batch #10) (diff) | |
| parent | config.txt: update versioncmp.prereleaseSuffix (diff) | |
| download | tgif-f57610a1ff7a547d1e11e24f942b1703cea81f81.tar.xz | |
Merge branch 'nd/versioncmp-prereleases'
The versionsort.prerelease configuration variable can be used to
specify that v1.0-pre1 comes before v1.0.
* nd/versioncmp-prereleases:
config.txt: update versioncmp.prereleaseSuffix
versionsort: support reorder prerelease suffixes
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index f1bc0f2d8c..35a5198856 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2560,6 +2560,18 @@ user.signingkey:: This option is passed unchanged to gpg's --local-user parameter, so you may specify a key using any method that gpg supports. +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". ++ +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. Currently only linkgit:git-instaweb[1] and linkgit:git-help[1] |