Update MaintNotes post 1.8.0 release
Junio C Hamano committed
Oct 21, 2012 at 14:22 UTC
955059c7d968be2ab587b5b4b5531e0916981ff5
1 file changed
+8
-8
MaintNotes
+8
-8
@@ -110,8 +110,8 @@ of git: "master", "maint", "next", and "pu".
110
The "master" branch is meant to contain what are very well tested and
111
ready to be used in a production setting. Every now and then, a "feature
112
release" is cut from the tip of this branch and they typically are named
113
-with three dotted decimal digits. The last such release was 1.7.12 done on
114
-Aug 19, 2012. You can expect that the tip of the "master" branch is always
113
+with three dotted decimal digits. The last such release was 1.8.0 done on
114
+Oct 21, 2012. You can expect that the tip of the "master" branch is always
115
more stable than any of the released versions.
116
117
Whenever a feature release is made, "maint" branch is forked off from
@@ -119,8 +119,8 @@ Whenever a feature release is made, "maint" branch is forked off from
119
release are applied to this branch and maintenance releases are cut from
120
it. The maintenance releases are named with four dotted decimal, named
121
after the feature release they are updates to; the last such release was
122
-1.7.12.3. New features never go to this branch. This branch is also
123
-merged into "master" to propagate the fixes forward.
122
+1.7.12.4. New features never go to this branch. This branch is also
123
+merged into "master" to propagate the fixes forward as needed.
124
125
A new development does not usually happen on "master". When you send a
126
series of patches, after review on the mailing list, a separate topic
@@ -135,10 +135,10 @@ breakage. The "next" branch is where new and exciting things take place. A
135
topic that is in "next" is expected to be polished to perfection before it
136
is merged to "master".
137
138
-The "pu" (proposed updates) branch bundles all the remaining topic
139
-branches. The topics on the branch are not complete, well tested, nor well
140
-documented and need further work. When a topic that was in "pu" proves to
141
-be in testable shape, it is merged to "next".
138
+The "pu" (proposed updates) branch bundles all the remaining topic branches.
139
+The topics on the branch are not complete, well tested, nor well documented
140
+and need further work. When a topic that was in "pu" proves to be in a
141
+testable shape, it is merged to "next".
142
143
You can run "git log --first-parent master..pu" to see what topics are
144
currently in flight. Sometimes, an idea that looked promising turns out