Meta/MaintNotes: post 2.12.1 update
In addition to the usual sample revision updates, talk about the "broken out" repo and clarify that topics can fork from commits older than the tip of the 'master' for bugfix topics.
Junio C Hamano committed
Mar 20, 2017 at 14:19 UTC
efc912b23335434674bcfda8199077f8dfa5d6f0
1 file changed
+9
-3
MaintNotes
+9
-3
@@ -117,6 +117,11 @@ My public git.git repositories are at:
117
git://git.sourceforge.jp/gitroot/git-core/git.git/
118
git://git-core.git.sourceforge.net/gitroot/git-core/git-core/
119
120
+This one shows not just the main integration branches, but also
121
+individual topics broken out:
122
+
123
+ git://github.com/gitster/git/
124
+
125
A few web interfaces are found at:
126
127
http://git.kernel.org/cgit/git/git.git
@@ -161,15 +166,16 @@ of last-minute issues. The maintenance releases used to be named with
166
four dotted decimal, named after the feature release they are updates
167
to (e.g. "1.8.5.1" was the first maintenance release for "1.8.5"
168
feature release). These days, maintenance releases are named by
164
-incrementing the last digit of three-dotted decimal name (e.g. "2.11.1"
165
-was the first maintenance release for the "2.11" series).
169
+incrementing the last digit of three-dotted decimal name (e.g. "2.12.1"
170
+was the first maintenance release for the "2.12" series).
171
172
New features never go to the 'maint' branch. This branch is also
173
merged into "master" to propagate the fixes forward as needed.
174
175
A new development does not usually happen on "master". When you send a
176
series of patches, after review on the mailing list, a separate topic
172
-branch is forked from the tip of "master" and your patches are queued
177
+branch is forked from the tip of "master" (or somewhere older, especially
178
+when the topic is about fixing an earlier bug) and your patches are queued
179
there, and kept out of "master" while people test it out. The quality of
180
topic branches are judged primarily by the mailing list discussions.
181