Update MaintNotes
Junio C Hamano committed
Jan 6, 2008 at 23:47 UTC
bd95ebda6674aa189dcd0f4b7fb0a93d8d06030a
1 file changed
+23
-16
MaintNotes
+23
-16
@@ -22,14 +22,22 @@ floor --- please do not hesitate to remind me.
22
23
The list archive is available at a few public sites as well:
24
25
+ http://news.gmane.org/gmane.comp.version-control.git/
26
http://marc.theaimsgroup.com/?l=git
26
- http://news.gmane.org/gmane.comp.version-control.git
27
- http://www.spinics.net/lists/git/
27
+ http://www.spinics.net/lists/git/
28
29
and some people seem to prefer to read it over NNTP:
30
31
nntp://news.gmane.org/gmane.comp.version-control.git
32
33
+When you point at a message in a mailing list archive, using
34
+gmane is often the easiest to follow by readers, like this:
35
+
36
+ http://thread.gmane.org/gmane.comp.version-control.git/27/focus=217
37
+
38
+as it also allows people who subscribe to the mailing list as
39
+gmane newsgroup to "jump to" the article.
40
+
41
* Repositories, branches and documentation.
42
43
My public git.git repository is at:
@@ -45,8 +53,8 @@ Impatient people might have better luck with the latter one.
53
54
Their gitweb interfaces are found at:
55
48
- http://git.kernel.org/?p=git/git.git
49
- http://repo.or.cz/w/alt-git.git
56
+ http://git.kernel.org/?p=git/git.git
57
+ http://repo.or.cz/w/alt-git.git
58
59
There are three branches in git.git repository that are not
60
about the source tree of git: "todo", "html" and "man". The
@@ -72,26 +80,27 @@ a task.
80
There are four branches in git.git repository that track the
81
source tree of git: "master", "maint", "next", and "pu". I may
82
add more maintenance branches (e.g. "maint-1.5.1") if we have
75
-huge backward incompatible feature updates in the future to keep
83
+hugely backward incompatible feature updates in the future to keep
84
an older release alive; I may not, but the distributed nature of
85
git means any volunteer can run a stable-tree like that himself.
86
87
The "master" branch is meant to contain what are very well
88
tested and ready to be used in a production setting. There
89
could occasionally be minor breakages or brown paper bag bugs
82
-but they are not expected to be anything major. Every now and
90
+but they are not expected to be anything major, and more
91
+importantly quickly and trivially fixable. Every now and
92
then, a "feature release" is cut from the tip of this branch and
93
they typically are named with three dotted decimal digits. The
85
-last such release was v1.5.3 done on Sep 2nd this year. You
86
-can expect that the tip of the "master" branch is always as
87
-stable as any of the released versions, if not more stable.
94
+last such release was v1.5.3 done on Sep 2nd last year. You
95
+can expect that the tip of the "master" branch is always more
96
+stable than any of the released versions.
97
98
Whenever a feature release is made, "maint" branch is forked off
99
from "master" at that point. Obvious, safe and urgent fixes
100
after a feature release are applied to this branch and
101
maintenance releases are cut from it. The maintenance releases
102
are named with four dotted decimal, named after the feature
94
-release they are updates to; the last such release was v1.5.2.5.
103
+release they are updates to; the last such release was v1.5.3.7.
104
New features never go to this branch. This branch is also
105
merged into "master" to propagate the fixes forward.
106
@@ -122,13 +131,11 @@ but is expected to work more or less without major breakage. I
131
usually use "next" version of git for my own work, so it cannot
132
be _that_ broken to prevent me from pushing the changes out.
133
The "next" branch is where new and exciting things take place.
125
-Note that being in "next" does not mean the change will be in
126
-the next feature release.
134
135
The above three branches, "master", "maint" and "next" are never
136
rewound, so you should be able to safely track them (this
137
automatically means the topics that have been merged into "next"
131
-are not rebased, and you can find the tip of topic branches you
138
+are never rebased, and you can find the tip of topic branches you
139
are interested in from the output of "git log next").
140
141
The "pu" (proposed updates) branch bundles all the remainder of
@@ -155,7 +162,7 @@ do it with this:
162
git merge that-topic-branch
163
git branch -d that-topic-branch
164
158
-However, being in "next" is not a guarantee to appear in the
165
+Note that being in "next" is not a guarantee to appear in the
166
next release (being in "master" is such a guarantee, unless it
167
is later found seriously broken and reverted), or even in any
168
future release. There even were cases that topics needed
@@ -195,8 +202,8 @@ relying on heavily:
202
203
- Linus on general design issues.
204
198
- - Linus, Shawn Pearce, Johannes Schindelin, Nicolas Pitre, and
199
- Rene Scharfe on general implementation issues.
205
+ - Linus, Shawn Pearce, Johannes Schindelin, Nicolas Pitre,
206
+ Réne Scharfe and Jeff King on general implementation issues.
207
208
- Shawn and Nicolas Pitre on pack issues.
209