MaintNotes: update for 2.8.3
Junio C Hamano committed
May 19, 2016 at 10:23 UTC
ab8eca3f45d5b9b567c08f69861b5306e1f27db6
1 file changed
+10
-8
MaintNotes
+10
-8
@@ -149,14 +149,16 @@ that the tip of the "master" branch is always more stable than any of
149
the released versions.
150
151
Whenever a feature release is made, "maint" branch is forked off from
152
-"master" at that point. Obvious, safe and urgent fixes after a
153
-feature release are applied to this branch and maintenance releases
154
-are cut from it. The maintenance releases used to be named with four
155
-dotted decimal, named after the feature release they are updates to
156
-(e.g. "1.8.5.1" was the first maintenance release for "1.8.5" feature
157
-release). These days, maintenance releases are named by incrementing
158
-the last digit of three-dotted decimal name (e.g. "2.7.4" is the
159
-fourth maintenance release for the "2.7" series).
152
+"master" at that point. Obvious and safe fixes after a feature
153
+release are applied to this branch and maintenance releases are cut
154
+from it. Usually the fixes are merged to the "master" branch first,
155
+several days before merged to the "maint" branch, to reduce the chance
156
+of last-minute issues. The maintenance releases used to be named with
157
+four dotted decimal, named after the feature release they are updates
158
+to (e.g. "1.8.5.1" was the first maintenance release for "1.8.5"
159
+feature release). These days, maintenance releases are named by
160
+incrementing the last digit of three-dotted decimal name (e.g. "2.8.3"
161
+is the third maintenance release for the "2.8" series).
162
163
New features never go to the 'maint' branch. This branch is also
164
merged into "master" to propagate the fixes forward as needed.