summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-03-13 09:50:24 -0700
committerJunio C Hamano <gitster@pobox.com>2023-03-13 09:50:24 -0700
commitc49b011830b1c101662dad9a55e5b4c03ac9739c (patch)
tree53f770c3c3fa512e3bf0b7207c2f5185cce2b86d
parente2da80cae8c27f3a97f15014ec48dff83a42fc38 (diff)
downloadgit-c49b011830b1c101662dad9a55e5b4c03ac9739c.tar.gz
MaintNotes: updte for 2.40
-rw-r--r--MaintNotes10
1 files changed, 7 insertions, 3 deletions
diff --git a/MaintNotes b/MaintNotes
index 8db80373cc..793b56864d 100644
--- a/MaintNotes
+++ b/MaintNotes
@@ -179,7 +179,7 @@ named with three dotted decimal digits (e.g. "1.8.5"), but we have
switched the versioning scheme and "feature releases" are named with
three-dotted decimal digits that ends with ".0" (e.g. "1.9.0").
-The last such release was 2.38 done on Oct 3rd, 2022. You can expect
+The last such release was 2.40 done on Mar 13rd, 2023. You can expect
that the tip of the "master" branch is always more stable than any of
the released versions.
@@ -224,7 +224,10 @@ and all topics that are remotely promising from the list traffic, so
please do not read too much into a topic being on (or not on) the "seen"
branch. This branch is mainly to remind the maintainer that the topics
in them may turn out to be interesting when they are polished, nothing
-more. The topics on this branch aren't usually complete, well tested,
+more, but can be used by contributors to anticipate what topics from
+others may cause conflict with your work, and find people who are working.
+on these topics to talk to before the potential conflicts get out of
+control. The topics on this branch aren't usually complete, well tested,
or well documented and they often need further work. When a topic that
was in "seen" proves to be in a testable shape, it is merged to "next".
@@ -234,7 +237,8 @@ to be not so good and the topic can be dropped from "seen" in such a case.
The output of the above "git log" talks about a "jch" branch, which is an
early part of the "seen" branch; that branch contains all topics that
are in "next" and a bit more (but not all of "seen") and is used by the
-maintainer for his daily work.
+maintainer for his daily work. Using the tip of this branch, instead of
+'next', as your daily driver is also recommended.
The two branches "master" and "maint" are never rewound, and "next"
usually will not be either. After a feature release is made from