MaintNotes: clarify the purpose of maint->master upmerge
Even though the paragraph before this one is pretty clear that topics are first merged to 'master' and then to 'maint', it was misleading to say 'maint' is merged to 'master' to propagate fixes forward, as most of the time, such an upmerge is a noop because topics merged to 'maint' are usually merged to 'master' already. These up-merges are done primarily to make sure that the tip of 'master' has updated release notes from all the maintenance tracks, so be explicit about that to avoid confusion. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 5, 2018 at 14:37 UTC
da6e86d37166e8c5111a158930ec56be71c85c06
1 file changed
+2
-2
MaintNotes
+2
-2
@@ -173,8 +173,8 @@ feature release). These days, maintenance releases are named by
173
incrementing the last digit of three-dotted decimal name (e.g. "2.12.1"
174
was the first maintenance release for the "2.12" series).
175
176
-New features never go to the 'maint' branch. This branch is also
177
-merged into "master" to propagate the fixes forward as needed.
176
+New features never go to the 'maint' branch. It is merged into "master"
177
+primarily to propagate the description in the release notes forward.
178
179
A new development does not usually happen on "master". When you send a
180
series of patches, after review on the mailing list, a separate topic