From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Mar 2013 20:45:22 GMT
Subject: Re: [BUG?] rebase -i: edit versus unmerged changes
Message-ID: <7vsj3pdcm5.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CALkWK0mgX40oicqxnoa7M3NJP_k8jDrg7mVGyWrg5T+=iRtHQA@mail.gmail.com>

Ramkumar Ramachandra <artagnon@gmail.com> writes:

> Andrew Wong wrote:
>> On 3/19/13, Ramkumar Ramachandra <artagnon@gmail.com> wrote:
>>> I know that this is expected behavior, but is there an easy way to get
>>> rid of this inconsistency?
>>
>> You can actually rely on "rebase" to run the appropriate command.
>
> Didn't Junio explicitly mention that this is undesirable earlier (from
> the point of view of `rebase -i` design)?  

I am sure it is my fault but my memory fails me.  As Andrew
mentioned, "rebase --continue" seemed to get this right.