Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 7, 2019, 19:46 UTC
Message-ID: <xmqq4lak8d4g.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CABPp-BE83Oe15U4yrkcV_-qzWocMS4UcVeG1VEoac-jXgw9Peg@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 12 quoted lines

> 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' ;-)

Show 18 quoted lines

>> Differences since v3 (full range-diff below):
>>   - Fixed the redundant "fatal: error:" error message prefixes, as pointed
>>     out by Duy
>>   - Rebased on 2.20.0
>>
>> Elijah Newren (8):
>>   rebase: make builtin and legacy script error messages the same
>>   rebase: fix incompatible options error message
>>   t5407: add a test demonstrating how interactive handles --skip
>>     differently
>>   am, rebase--merge: do not overlook --skip'ed commits with post-rewrite
>>   git-rebase, sequencer: extend --quiet option for the interactive
>>     machinery
>>   git-legacy-rebase: simplify unnecessary triply-nested if
>>   rebase: define linearization ordering and enforce it
>>   rebase: Implement --merge via the interactive machinery
>>
> ...