MaintNotes: post 1.7.7 update
Junio C Hamano committed
Oct 4, 2011 at 19:21 UTC
06e025c56ab59086d63748673acb5a31d8c22545
1 file changed
+19
-21
MaintNotes
+19
-21
@@ -79,13 +79,11 @@ hints.
79
My public git.git repository is at:
80
81
git://git.kernel.org/pub/scm/git/git.git/
82
+ git://repo.or.cz/alt-git.git
83
+ https://github.com/git/git
84
+ https://code.google.com/p/git-core/
85
83
-Immediately after I publish to the primary repository at kernel.org, I
84
-also push into an alternate here:
85
-
86
- git://repo.or.cz/alt-git.git/
87
-
88
-Impatient people might have better luck with the latter one (there are a
86
+Impatient people might have better luck with the latter two (there are a
87
few other mirrors I push into at sourceforge and github as well).
88
89
Their gitweb interfaces are found at:
@@ -96,20 +94,20 @@ Their gitweb interfaces are found at:
94
There are three branches in git.git repository that are not about the
95
source tree of git: "html", "man", and "todo".
96
99
-The "html" and "man" are auto-generated documentation from the tip of
100
-the "master" branch; the tip of "html" is extracted to be visible at
101
-kernel.org at:
97
+The "html" and "man" are preformatted documentation from the tip of
98
+the "master" branch; the tip of "html" is visible at:
99
100
http://www.kernel.org/pub/software/scm/git/docs/
101
+ http://git-core.googlecode.com/git-history/html/git.html
102
105
-The above URL is the top-level documentation page, and it has links to
106
-documentation of older releases.
103
+The above URL is the top-level documentation page, and it may have
104
+links to documentation of older releases.
105
106
The "todo" branch was originally meant to contain a TODO list for me,
107
but is mostly used to keep some helper scripts I use to maintain git.
110
-For example, the script to maintain the two documentation branches are
111
-found there as dodoc.sh, which may be a good demonstration of how to
112
-use a post-update hook to automate a task after pushing into a
108
+For example, the script that was used to maintain the two documentation
109
+branches are found there as dodoc.sh, which may be a good demonstration
110
+of how to use a post-update hook to automate a task after pushing into a
111
repository.
112
113
There are four branches in git.git repository that track the source tree
@@ -118,16 +116,16 @@ of git: "master", "maint", "next", and "pu".
116
The "master" branch is meant to contain what are very well tested and
117
ready to be used in a production setting. Every now and then, a "feature
118
release" is cut from the tip of this branch and they typically are named
121
-with three dotted decimal digits. The last such release was 1.7.6 done on
122
-June 26, 2011. You can expect that the tip of the "master" branch is
123
-always more stable than any of the released versions.
119
+with three dotted decimal digits. The last such release was 1.7.7 done on
120
+Sept 30, 2011. You can expect that the tip of the "master" branch is always
121
+more stable than any of the released versions.
122
123
Whenever a feature release is made, "maint" branch is forked off from
124
"master" at that point. Obvious, safe and urgent fixes after a feature
125
release are applied to this branch and maintenance releases are cut from
126
it. The maintenance releases are named with four dotted decimal, named
127
after the feature release they are updates to; the last such release was
130
-1.7.6.1. New features never go to this branch. This branch is also
128
+1.7.6.4. New features never go to this branch. This branch is also
129
merged into "master" to propagate the fixes forward.
130
131
A new development does not usually happen on "master". When you send a
@@ -160,9 +158,9 @@ using the topics that didn't make the cut in the feature release.
158
159
Note that being in "next" is not a guarantee to appear in the next
160
release, nor even in any future release. There were cases that topics
163
-needed reverting a few commits in them before graduating to "master", or a
164
-topic that already was in "next" was reverted from "next" because fatal
165
-flaws were found in it after it was merged.
161
+needed reverting a few commits in them before graduating to "master",
162
+or a topic that already was in "next" was reverted from "next" because
163
+fatal flaws were found in it after it was merged.
164
165
166
* Other people's trees, trusted lieutenants and credits.