Re: [PATCH v4 0/6] rebase -i: support more options

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Sep 9, 2019, 18:51 UTC
Message-ID: <d16a2c76-32c0-1080-a2de-00803ff84962@gmail.com>
In-Reply-To: <xmqq8sqxl557.fsf@gitster-ct.c.googlers.com>

On 09/09/2019 19:02, Junio C Hamano wrote:

Show 7 quoted lines

> Rohit Ashiwal <rohit.ashiwal265@gmail.com> writes:
> 
>> Following the suggestion of Phillip I've rebased my patch on master (745f681289)
>> and cherry-picking b0a3186140.
> 
> Sorry, but that's horrible.  The latter does not even cleanly apply
> on the former.

Yes I had assumed that the cherry pick would become the first patch of this series and be dropped from pw/rebase-i-show-HEAD-to-reword. I should have been more explicit about that.

> Let me see if I can find time to whip this into a reasonable shape.

As pw/rebase-i-show-HEAD-to-reword is slated for next perhaps these could build on that. The first patch needs am -3 to apply to that branch but the result looks ok and the rest apply as is.

Best Wishes

Phillip

> Thanks.
>