diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-25 22:16:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-26 09:39:00 -0700 |
| commit | 37f6040764489ee63b14807c1196c3b2e6469eb4 (patch) | |
| tree | d4ed00e2d9739d495bf082acadefd985ddf0e20b /Documentation/SubmittingPatches | |
| parent | 0a02ca2383455e40cfc0b1c0818479c2d36fe6cd (diff) | |
| download | git-37f6040764489ee63b14807c1196c3b2e6469eb4.tar.gz | |
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 <linusa@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/SubmittingPatches')
| -rw-r--r-- | Documentation/SubmittingPatches | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index f1774c91e9..c500fb4398 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 --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`. |