From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 22 Feb 2020 17:16:56 GMT
Subject: Re: What's cooking in git.git (Feb 2020, #04; Mon, 17)
Message-ID: <xmqq7e0e7d9z.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CABPp-BE_ktNmDB43N_qijzYzhXvsK8Fi7TJQ7goHu+MzGvdpBQ@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

>> > [Stalled]
>> >
>> > * pw/advise-rebase-skip (2019-12-06) 9 commits
>> >   - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts
>> >   - rebase: fix advice when a fixup creates an empty commit
>> > ...
>> The tip "rebase -i: leave CHERRY_PICK_HEAD when there are conflicts"
>> needs reworking and can be dropped (cf
>> <7e1b92f5-48df-e202-ebcc-5b15987a7d63@gmail.com>). The other RFC patch
>> "rebase: fix advice when a fixup creates an empty commit" [1] could do
>> with someone commenting on it (I've Cc'd dscho and Elijah). I think the
>
> I'll try to take a look early to middle of next week.

Thanks, both.  I think the early ones except for those two make
sense by themselves, so perhaps I'll advance them to 'next'
independently of these two steps.