On 23.10.21 22:32, Junio C Hamano wrote:> * A new feature should be based on `master` in general. If the new > - feature depends on a topic that is in `seen`, but not in `master`, > - base your work on the tip of that topic. > + feature depends on other topics that are in `next`, but not in > + `master`, fork a branch from the tip of `master`, merge these topics > + to the branch, and work on that branch. You can remind yourself of > + how you prepared the base with `git log --first-parent master..` > + easily by doing so. Using the topic branches from gitster/git that were merged? Or by selecting the specific commits from the merge into next? > @@ -260,8 +281,8 @@ or include any extra files which do not relate to what your patch > is trying to achieve. Make sure to review > your patch after generating it, to ensure accuracy. Before > sending out, please make sure it cleanly applies to the `master` > -branch head. If you are preparing a work based on "next" branch, > -that is fine, but please mark it as such. > +branch head. If you are preparing a work based on selected topics > +merged to `master`, please mark your patch as such. I think this meant to say 'merged to "next|maint|seen"'? Or topics selected for being merged into master? Thanks, Fabian
