MaintNotes: Post 2.6.3 adjustment
Junio C Hamano committed
Nov 5, 2015 at 14:37 UTC
6aee48d13400459e59ad63933c92eca04c841298
1 file changed
+8
-5
MaintNotes
+8
-5
@@ -142,8 +142,8 @@ are cut from it. The maintenance releases used to be named with four
142
dotted decimal, named after the feature release they are updates to
143
(e.g. "1.8.5.1" was the first maintenance release for "1.8.5" feature
144
release). These days, maintenance releases are named by incrementing
145
-the last digit of three-dotted decimal name (e.g. "2.5.1" is the
146
-fourth maintenance release for the "2.5" series).
145
+the last digit of three-dotted decimal name (e.g. "2.6.3" is the
146
+third maintenance release for the "2.6" series).
147
148
New features never go to the 'maint' branch. This branch is also
149
merged into "master" to propagate the fixes forward as needed.
@@ -159,12 +159,12 @@ general, the "next" branch always contains the tip of "master". It might
159
not be quite rock-solid, but is expected to work more or less without major
160
breakage. The "next" branch is where new and exciting things take place. A
161
topic that is in "next" is expected to be polished to perfection before it
162
-is merged to "master". Please help this process by building, using the
162
+is merged to "master". Please help this process by building & using the
163
"next" branch for your daily work, and reporting any new bugs you find to
164
the mailing list, before the breakage is merged down to the "master".
165
166
The "pu" (proposed updates) branch bundles all the remaining topic
167
-branches the maintainer happens to have. There is no guarantee that
167
+branches the maintainer happens to have seen. There is no guarantee that
168
the maintainer has enough bandwidth to pick up any and all topics that
169
are remotely promising from the list traffic, so please do not read
170
too much into a topic being on (or not on) the "pu" branch. This
@@ -190,7 +190,7 @@ or a topic that already was in "next" was reverted from "next" because
190
fatal flaws were found in it after it was merged to "next".
191
192
193
-* Other people's trees, trusted lieutenants and credits.
193
+* Other people's trees.
194
195
Documentation/SubmittingPatches outlines to whom your proposed changes
196
should be sent. As described in contrib/README, I would delegate fixes
@@ -211,3 +211,6 @@ own authoritative repository and maintainers:
211
212
https://github.com/git-l10n/git-po/
213
214
+When sending proposed updates and fixes to these parts of the system,
215
+please base your patches on these trees, not git.git (the former two
216
+even have different directory structures).