MaintNotes update post 2.2
Junio C Hamano committed
Nov 26, 2014 at 14:51 UTC
2736c99c396e425f9b2fd043498ae5ee338565e1
1 file changed
+5
-5
MaintNotes
+5
-5
@@ -118,7 +118,7 @@ named with three dotted decimal digits (e.g. "1.8.5"), but recently we
118
switched the versioning scheme and "feature releases" are named with
119
three-dotted decimal digits that ends with ".0" (e.g. "1.9.0").
120
121
-The last such release was 1.9.0 done on Feb 14, 2014. You can expect
121
+The last such release was 2.2.0 done on Nov 26, 2014. You can expect
122
that the tip of the "master" branch is always more stable than any of
123
the released versions.
124
@@ -129,8 +129,8 @@ are cut from it. The maintenance releases used to be named with four
129
dotted decimal, named after the feature release they are updates to
130
(e.g. "1.8.5.1" was the first maintenance release for "1.8.5" feature
131
release). These days, maintenance releases are named by incrementing
132
-the last digit of three-dotted decimal name (e.g. "1.9.1" is the first
133
-maintenance relaese for "1.9.0" series).
132
+the last digit of three-dotted decimal name (e.g. "2.2.1" will be the
133
+first maintenance relaese for "2.2" series).
134
135
New features never go to the 'maint' branch. This branch is also
136
merged into "master" to propagate the fixes forward as needed.
@@ -156,8 +156,8 @@ too much into a topic being on (or not on) the "pu" branch. This
156
branch is mainly to remind the maintainer that the topics in them may
157
turn out to be interesting when they are polished, nothing more. The
158
topics on this branch aren't usually complete, well tested, or well
159
-documented and they need further work. When a topic that was in "pu"
160
-proves to be in a testable shape, it is merged to "next".
159
+documented and they often need further work. When a topic that was
160
+in "pu" proves to be in a testable shape, it is merged to "next".
161
162
You can run "git log --first-parent master..pu" to see what topics are
163
currently in flight. Sometimes, an idea that looked promising turns out