Skip to content

Commit 37f6040

Browse files
committed
SubmittingPatches: choice of base for fixing an older maintenance track
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0a02ca2 commit 37f6040

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

Documentation/SubmittingPatches

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,12 @@ latest HEAD commit of `maint` or `master` based on the following cases:
4646
* If you are fixing bugs in the released version, use `maint` as the
4747
starting point (which may mean you have to fix things without using
4848
new API features on the cutting edge that recently appeared in
49-
`master` but were not available in the released version).
49+
`master` but were not available in the released version). If the bug
50+
exists in an older version (e.g., commit `X` introduced the bug, and
51+
`git describe --contains X` says `v2.30.0-rc2-gXXXXXX` has it), then
52+
use the tip of the maintenance branch for the 2.30.x versions in the
53+
`maint-2.30` branch in https://github.com/gitster/git[the maintainer's
54+
repo].
5055

5156
* Otherwise (such as if you are adding new features) use `master`.
5257

0 commit comments

Comments
 (0)