Skip to content

Commit c7b8cf4

Browse files
committed
howto/maintain-git.txt: new version numbering scheme
We wanted to call the upcoming release "Git 1.9", with its maintenance track being "Git 1.9.1", "Git 1.9.2", etc., but various third-party tools are reported to assume that there are at least three dewey-decimal components in our version number. Adjust the plan so that vX.Y.0 are feature releases while vX.Y.Z (Z > 0) are maintenance releases. Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2171c0c commit c7b8cf4

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

Documentation/howto/maintain-git.txt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,26 @@ The policy on Integration is informally mentioned in "A Note
3939
from the maintainer" message, which is periodically posted to
4040
this mailing list after each feature release is made.
4141

42-
- Feature releases are numbered as vX.Y.Z and are meant to
42+
- Feature releases are numbered as vX.Y.0 and are meant to
4343
contain bugfixes and enhancements in any area, including
4444
functionality, performance and usability, without regression.
4545

4646
- One release cycle for a feature release is expected to last for
4747
eight to ten weeks.
4848

49-
- Maintenance releases are numbered as vX.Y.Z.W and are meant
50-
to contain only bugfixes for the corresponding vX.Y.Z feature
51-
release and earlier maintenance releases vX.Y.Z.V (V < W).
49+
- Maintenance releases are numbered as vX.Y.Z and are meant
50+
to contain only bugfixes for the corresponding vX.Y.0 feature
51+
release and earlier maintenance releases vX.Y.W (W < Z).
5252

5353
- 'master' branch is used to prepare for the next feature
5454
release. In other words, at some point, the tip of 'master'
55-
branch is tagged with vX.Y.Z.
55+
branch is tagged with vX.Y.0.
5656

5757
- 'maint' branch is used to prepare for the next maintenance
58-
release. After the feature release vX.Y.Z is made, the tip
58+
release. After the feature release vX.Y.0 is made, the tip
5959
of 'maint' branch is set to that release, and bugfixes will
6060
accumulate on the branch, and at some point, the tip of the
61-
branch is tagged with vX.Y.Z.1, vX.Y.Z.2, and so on.
61+
branch is tagged with vX.Y.1, vX.Y.2, and so on.
6262

6363
- 'next' branch is used to publish changes (both enhancements
6464
and fixes) that (1) have worthwhile goal, (2) are in a fairly
@@ -86,6 +86,10 @@ this mailing list after each feature release is made.
8686
users are encouraged to test it so that regressions and bugs
8787
are found before new topics are merged to 'master'.
8888

89+
Note that before v1.9.0 release, the version numbers used to be
90+
structured slightly differently. vX.Y.Z were feature releases while
91+
vX.Y.Z.W were maintenance releases for vX.Y.Z.
92+
8993

9094
A Typical Git Day
9195
-----------------

0 commit comments

Comments
 (0)