Junio C Hamano <gitster@xxxxxxxxx> writes: >>> @@ -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? > > Ah, thanks for catching. I meant "not merged to 'master'" (will fix > locally). Sorry, should have re-read it more carefully. The original text is saying what I wanted to say, but I misread it ;-) We earlier in the document said that there are three possible bases; fixes are usually based on 'maint', new features on 'master', but as an exception, if your new feature need to depend on something not yet in 'master', then you start a branch from 'master', merge selected topics into that branch, and use the resulting branch as the 'base' of your topic. We do not want a new topic based on 'next', so preparing such a synthetic base by starting from 'next' and merging topics that are not yet in 'next' is unwelcome. Perhaps there needs some rewording to clarify that the sentence is referring to that case. Thanks again.
