Re: [PATCH v5 00/10] rebase: fix several code/testing/documentation issues around flag incompatibilities

From: Elijah Newren <newren@gmail.com>
Date: Jan 25, 2023, 16:48 UTC
Message-ID: <CABPp-BEWC_GQXLKvokLVgd4-Hq16MoZggyp6r-sj29SYyLippQ@mail.gmail.com>
In-Reply-To: <xmqqa626fu0x.fsf@gitster.g>

On Wed, Jan 25, 2023 at 8:39 AM Junio C Hamano <gitster@pobox.com> wrote:

Show 14 quoted lines

>
> "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > Changes since v4:
> >
> >  * Pulled out the changes regarding incompatibility detection for
> >    --[no-]reapply-cherry-picks into a separate patch. Phillip helped a lot
> >    with understanding the behavior, suggesting changes, and getting the
> >    wording right, and I think it deserves its own patch with its own
> >    explanation.
>
> Hmph, does this replace the previous round that has already been in
> 'next' for two days?  I do not mind reverting the merge and requeuing
> it, but just wanted ot make sure before doing anything.

Sorry, I didn't realize it had merged to next. With Phillip's ongoing reviews and requests for changes, which you had even commented on (https://lore.kernel.org/git/xmqqpmb4j8e9.fsf@gitster.g/ and the thread that was in the middle of), I assumed it was still only in seen.

But yes, if you could revert from next and replace, that would be great. Now that v5 has Phillip's blessing (and multiple of his corrections), I think it's good to merge down.