[PATCH v3 6/5] SubmittingPatches: choice of base for fixing an older maintenance track

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 26, 2023, 05:16 UTC
Message-ID: <xmqqh6prfe0u.fsf_-_@gitster.g>
In-Reply-To: <pull.1556.v3.git.1690340701.gitgitgadget@gmail.com>

When working on an high-value bugfix that must be given to ancient maintenance tracks, a starting point that is older than `maint` may have to be chosen.

Helped-by: Linus Arver <linusa@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/SubmittingPatches | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index f1774c91e9..d1e3783978 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -46,7 +46,12 @@ latest HEAD commit of `maint` or `master` based on the following cases:
 * If you are fixing bugs in the released version, use `maint` as the
   starting point (which may mean you have to fix things without using
   new API features on the cutting edge that recently appeared in
-  `master` but were not available in the released version).
+  `master` but were not available in the released version). If the bug
+  exists in an older version (e.g., commit `X` introduced the bug, and
+  `git describe --containx X` says `v2.30.0-rc2-gXXXXXX` has it), then
+  use the tip of the maintenance branch for the 2.30.x versions in the
+  `maint-2.30` branch in https://github.com/gitster/git[the maintainer's
+  repo].
 
 * Otherwise (such as if you are adding new features) use `master`.

-- 
2.41.0-450-ga80be15292