Re: storing cover letter of a patch series?
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 5, 2016, 21:23 UTC
- Message-ID
- <CAPc5daV51cwPs-8uc_SYLaod7RB7aDGYbjt-x-JsY1qNL81QRA@mail.gmail.com>
- In-Reply-To
- <10752620.2J2dEZLIGc@mfick1-lnx>
On Fri, Aug 5, 2016 at 2:20 PM, Martin Fick <mfick@codeaurora.org> wrote:
Show 11 quoted lines
> On Friday, August 05, 2016 08:39:58 AM you wrote: >> * A new topic, when you merge it to the "lit" branch, you >> describe the cover as the merge commit message. >> >> * When you updated an existing topic, you tell a tool >> like "rebase -i -p" to recreate "lit" branch on top of >> the mainline. This would give you an opportunity to >> update the cover. > > This is a neat idea. How would this work if there is no > merge commit (mainline hasn't moved)?
Sorry, I do not understand your question. You always merge into your own "lit", which is based on (some) version of the mainline. If a topic builds on top of the mainline, you "merge --no-ff" it into "lit". Because no merges on "lit" will be part of the future mainline anyway, even the project frowns upon a "no-ff" merge, that will not be a problem.