Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 7, 2019, 20:11 UTC
- Message-ID
- <xmqqzhsc6xdk.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <xmqq4lak8d4g.fsf@gitster-ct.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 23 quoted lines
> Elijah Newren <newren@gmail.com> writes:
>
>> On Tue, Dec 11, 2018 at 8:11 AM Elijah Newren <newren@gmail.com> wrote:
>>>
>>> This series continues the work of making rebase more self-consistent
>>> by removing inconsistencies between different backends. In
>>> particular, this series focuses on making the merge machinery behave
>>> like the interactive machinery (though a few differences between the am
>>> and interactive backends are also fixed along the way), and ultimately
>>> removes the merge backend in favor of reimplementing the relevant
>>> options on top of the interactive machinery.
>>
>> Friendly ping...let me know if you want me to simply resend v4.
>>
>
> If you have anything newer than 90673135 ("rebase: Implement --merge
> via the interactive machinery", 2018-12-11), then yeah, I haven't
> seen it.
>
> Thanks.
>
> P.S. even if that one is latest, I would need to downcase Implement
> before it hits 'next' ;-)Ah, one thing I forgot to mention. Some of the tests updated in this series are unhappy with Dscho's "drive 'am' directly from the built-in code, bypassing git-rebase--am.sh scriptlet" topic.