Minor copyediting of MaintNotes
Junio C Hamano committed
Jul 27, 2007 at 17:22 UTC
62e619caae70f61a207e794cf544bff3ebfe88ce
1 file changed
+11
-5
MaintNotes
+11
-5
@@ -78,14 +78,16 @@ could occasionally be minor breakages or brown paper bag bugs
78
but they are not expected to be anything major. Every now and
79
then, a "feature release" is cut from the tip of this branch and
80
they typically are named with three dotted decimal digits. The
81
-last such release was v1.5.2 done on May 20th this year.
81
+last such release was v1.5.2 done on May 20th this year. You
82
+can expect that the tip of the "master" branch is always as
83
+stable as any of the released versions, if not more stable.
84
85
Whenever a feature release is made, "maint" branch is forked off
86
from "master" at that point. Obvious, safe and urgent fixes
87
after a feature release are applied to this branch and
88
maintenance releases are cut from it. The maintenance releases
89
are named with four dotted decimal, named after the feature
88
-release they are updates to; the last such release was v1.5.1.6.
90
+release they are updates to; the last such release was v1.5.2.4.
91
New features never go to this branch. This branch is also
92
merged into "master" to propagate the fixes forward.
93
@@ -116,6 +118,8 @@ but is expected to work more or less without major breakage. I
118
usually use "next" version of git for my own work, so it cannot
119
be _that_ broken to prevent me from pushing the changes out.
120
The "next" branch is where new and exciting things take place.
121
+Note that being in "next" does not mean the change will be in
122
+the next feature release.
123
124
The above three branches, "master", "maint" and "next" are never
125
rewound, so you should be able to safely track them (this
@@ -125,7 +129,9 @@ are interested in from the output of "git log next").
129
130
The "pu" (proposed updates) branch bundles all the remainder of
131
topic branches. The "pu" branch, and topic branches that are
128
-only in "pu", are subject to rebasing in general.
132
+only in "pu", are subject to rebasing in general. By the above
133
+definition of how "next" works, you can tell that this branch
134
+will contain quite experimental and obviously broken stuff.
135
136
When a topic that was in "pu" proves to be in testable shape, it
137
graduates to "next". I do this with:
@@ -134,11 +140,11 @@ graduates to "next". I do this with:
140
git merge that-topic-branch
141
142
Sometimes, an idea that looked promising turns out to be not so
137
-hot and the topic can be dropped from "pu" in such a case.
143
+good and the topic can be dropped from "pu" in such a case.
144
145
A topic that is in "next" is expected to be tweaked and fixed to
146
perfection before it is merged to "master" (that's why "master"
141
-can be expected to stay very stable). Similarly to the above I
147
+can be expected to stay very stable). Similarly to the above, I
148
do it with this:
149
150
git checkout master