mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SubmittingPatches: choice of base for fixing an older maintenance track

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2023-07-25 22:16:49 -07:00
parent 0a02ca2383
commit 37f6040764
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/SubmittingPatches
View File

@ -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 * 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 starting point (which may mean you have to fix things without using
new API features on the cutting edge that recently appeared in 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 --contains 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`. * Otherwise (such as if you are adding new features) use `master`.