@matheusbsbs / matheus-bagliano / commits / 2389460a6a

MaintNotes: adjust for pinbox->lore, mention CoC

Junio C Hamano committed Jun 1, 2020 at 09:31 UTC 2389460a6afcfe79f3b4a4bad6f32dc07795c0e3
1 file changed +16 -9
MaintNotes
+16 -9
@@ -34,14 +34,14 @@ becomes calmer before sending such a reminder.
34
35 The list archive is available at a few public sites:
36
37 - http://public-inbox.org/git/
37 + http://lore.kernel.org/git/
38 http://marc.info/?l=git
39 http://www.spinics.net/lists/git/
40
41 For those who prefer to read it over NNTP:
42
43 + nntp://nntp.lore.kernel.org/org.kernel.vger.git
44 nntp://news.public-inbox.org/inbox.comp.version-control.git
44 - nntp://news.gmane.org/gmane.comp.version-control.git
45
46 are available.
47
@@ -49,7 +49,7 @@ When you point at a message in a mailing list archive, using its
49 message ID is often the most robust (if not very friendly) way to do
50 so, like this:
51
52 - http://public-inbox.org/git/Pine.LNX.4.58.0504150753440.7211@ppc970.osdl.org
52 + http://lore.kernel.org/git/Pine.LNX.4.58.0504150753440.7211@ppc970.osdl.org
53
54 Often these web interfaces accept the message ID with enclosing <>
55 stripped (like the above example to point at one of the most important
@@ -69,6 +69,12 @@ Git is a member project of software freedom conservancy, a non-profit
69 organization (https://sfconservancy.org/). To reach a committee of
70 liaisons to the conservancy, contact them at <git@sfconservancy.org>.
71
72 +For our expectations on the behaviour of the community participants
73 +towards each other, see CODE_OF_CONDUCT.md at the top level of the source
74 +tree, or:
75 +
76 + https://github.com/git/git/blob/master/CODE_OF_CONDUCT.md
77 +
78
79 * Reporting bugs
80
@@ -118,7 +124,6 @@ My public git.git repositories are (mirrored) at:
124 https://kernel.googlesource.com/pub/scm/git/git
125 git://repo.or.cz/alt-git.git/
126 https://github.com/git/git/
121 - git://git-core.git.sourceforge.net/gitroot/git-core/git-core/
127
128 This one shows not just the main integration branches, but also
129 individual topics broken out:
@@ -127,7 +132,7 @@ individual topics broken out:
132
133 A few web interfaces are found at:
134
130 - http://git.kernel.org/cgit/git/git.git
135 + http://git.kernel.org/pub/scm/git/git.git
136 https://kernel.googlesource.com/pub/scm/git/git
137 http://repo.or.cz/w/alt-git.git
138
@@ -152,11 +157,11 @@ of git: "master", "maint", "next", and "pu".
157 The "master" branch is meant to contain what are very well tested and
158 ready to be used in a production setting. Every now and then, a
159 "feature release" is cut from the tip of this branch. They used to be
155 -named with three dotted decimal digits (e.g. "1.8.5"), but recently we
160 +named with three dotted decimal digits (e.g. "1.8.5"), but we have
161 switched the versioning scheme and "feature releases" are named with
162 three-dotted decimal digits that ends with ".0" (e.g. "1.9.0").
163
159 -The last such release was 2.15 done on Oct 30th, 2017. You can expect
164 +The last such release was 2.27 done on Jun 1st, 2020. You can expect
165 that the tip of the "master" branch is always more stable than any of
166 the released versions.
167
@@ -169,8 +174,8 @@ of last-minute issues. The maintenance releases used to be named with
174 four dotted decimal, named after the feature release they are updates
175 to (e.g. "1.8.5.1" was the first maintenance release for "1.8.5"
176 feature release). These days, maintenance releases are named by
172 -incrementing the last digit of three-dotted decimal name (e.g. "2.12.1"
173 -was the first maintenance release for the "2.12" series).
177 +incrementing the last digit of three-dotted decimal name (e.g. "2.26.1"
178 +was the first maintenance release for the "2.26" series).
179
180 New features never go to the 'maint' branch. It is merged into "master"
181 primarily to propagate the description in the release notes forward.
@@ -214,6 +219,8 @@ The two branches "master" and "maint" are never rewound, and "next"
219 usually will not be either. After a feature release is made from
220 "master", however, "next" will be rebuilt from the tip of "master"
221 using the topics that didn't make the cut in the feature release.
222 +Some topics that used to be in "next" during the previous cycle may
223 +get ejected from "next" when this happens.
224
225 A natural consequence of how "next" and "pu" bundles topics together
226 is that until a topic is merged to "next", updates to it is expected