Post 1.6.2 maintnotes updates

Thank new contributors as well.

Junio C Hamano committed Mar 4, 2009 at 11:41 UTC 1c35937ee6dd6d3dca06e3d84151b010f552519f
1 file changed +30 -28
MaintNotes
+30 -28
@@ -57,12 +57,12 @@ Their gitweb interfaces are found at:
57 http://git.kernel.org/?p=git/git.git
58 http://repo.or.cz/w/alt-git.git
59
60 -There are three branches in git.git repository that are not
61 -about the source tree of git: "todo", "html" and "man". The
62 -first one was meant to contain TODO list for me, but I am not
63 -good at maintaining such a list and it is not as often updated as
64 -it could/should be. It also contains some helper scripts I use
65 -to maintain git.
60 +There are three branches in git.git repository that are not about the
61 +source tree of git: "todo", "html" and "man". The first one was meant
62 +to contain TODO list for me, but I am not good at maintaining such a
63 +list and it is in an abandoned state. The branch mostly is used to
64 +keep some helper scripts I use to maintain git and the regular "What's
65 +in/cooking" messages these days.
66
67 The "html" and "man" are autogenerated documentation from the
68 tip of the "master" branch; the tip of "html" is extracted to be
@@ -75,8 +75,8 @@ links to documentation of older releases.
75
76 The script to maintain these two documentation branches are
77 found in "todo" branch as dodoc.sh, if you are interested. It
78 -is a good demonstration of how to use an update hook to automate
79 -a task.
78 +is a good demonstration of how to use a post-update hook to
79 +automate a task.
80
81 There are four branches in git.git repository that track the
82 source tree of git: "master", "maint", "next", and "pu". I may
@@ -92,7 +92,7 @@ but they are not expected to be anything major, and more
92 importantly quickly and trivially fixable. Every now and
93 then, a "feature release" is cut from the tip of this branch and
94 they typically are named with three dotted decimal digits. The
95 -last such release was 1.6.1 done on Dec 24th 2008. You
95 +last such release was 1.6.2 done on Mar 3rd 2009. You
96 can expect that the tip of the "master" branch is always more
97 stable than any of the released versions.
98
@@ -101,7 +101,7 @@ from "master" at that point. Obvious, safe and urgent fixes
101 after a feature release are applied to this branch and
102 maintenance releases are cut from it. The maintenance releases
103 are named with four dotted decimal, named after the feature
104 -release they are updates to; the last such release was 1.6.0.6.
104 +release they are updates to; the last such release was 1.6.1.3.
105 New features never go to this branch. This branch is also
106 merged into "master" to propagate the fixes forward.
107
@@ -143,7 +143,7 @@ able to safely track them.
143 After a feature release is made from "master", however, "next"
144 will be rebuilt from the tip of "master" using the surviving
145 topics. The commit that replaces the tip of the "next" will
146 -have the identical tree, but it will have different ancestry
146 +usually have the identical tree, but it will have different ancestry
147 from the tip of "master". An announcement will be made to warn
148 people about such a rebasing.
149
@@ -173,24 +173,19 @@ do it with this:
173
174 Note that being in "next" is not a guarantee to appear in the
175 next release (being in "master" is such a guarantee, unless it
176 -is later found seriously broken and reverted), or even in any
176 +is later found seriously broken and reverted), nor even in any
177 future release. There even were cases that topics needed
178 reverting a few commits in them before graduating to "master",
179 or a topic that already was in "next" were entirely reverted
180 from "next" because fatal flaws were found in them later.
181
182 -Starting from v1.5.0, "master" and "maint" have release notes
183 -for the next release in Documentation/RelNotes-* files, so that
184 -I do not have to run around summarizing what happened just
185 -before the release.
186 -
182
183 * Other people's trees, trusted lieutenants and credits.
184
190 -Documentation/SubmittingPatches outlines who your changes should
191 -be sent to. As described in contrib/README, I would delegate
192 -fixes and enhancements in contrib/ area to primary contributors
193 -of them.
185 +Documentation/SubmittingPatches outlines to whom your proposed
186 +changes should be sent. As described in contrib/README, I would
187 +delegate fixes and enhancements in contrib/ area to the primary
188 +contributors of them.
189
190 Although the following are included in git.git repository, they
191 have their own authoritative repository and maintainers:
@@ -211,7 +206,8 @@ relying on heavily:
206 - Linus on general design issues.
207
208 - Linus, Shawn Pearce, Johannes Schindelin, Nicolas Pitre,
214 - René Scharfe and Jeff King on general implementation issues.
209 + René Scharfe, Jeff King and Johannes Sixt on general
210 + implementation issues.
211
212 - Shawn and Nicolas Pitre on pack issues.
213
@@ -223,18 +219,24 @@ relying on heavily:
219
220 - Simon Hausmann on git-p4.
221
226 - - Jakub Narebski, Petr Baudis, and Luben Tuikov on gitweb.
222 + - Jakub Narebski, Petr Baudis, Luben Tuikov, Giuseppe Bilotta
223 + on gitweb.
224 +
225 + - J. Bruce Fields on documentation (and countless others for
226 + proofreading and fixing).
227 +
228 + - Alexandre Julliard on Emacs integration.
229
228 - - J. Bruce Fields on documentaton issues.
230 + - Charles Bailey for git-mergetool (and Theodore Ts'o for creating
231 + the tool).
232
233 - Johannes Schindelin, Johannes Sixt and others for their effort
231 - to move things forward on the Windows front. Most of the fruits
232 - from their porting efforts have been merged to the mainline git.git
233 - repository in 1.6.0 release.
234 + to move things forward on the Windows front.
235
236 - People on non-Linux platforms for keeping their eyes on
237 portability; especially, Randal Schwartz, Theodore Ts'o,
237 - Jason Riedy, Thomas Glanzmann, but countless others as well.
238 + Jason Riedy, Thomas Glanzmann, Brandon Casey, but countless
239 + others as well.
240
241 * This document
242