Re: git cherry-pick --continue?

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 10, 2010, 22:21 UTC
Message-ID: <7vbpfw3f6t.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7v63644uoq.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

Show 6 quoted lines

> Jeff King <peff@peff.net> writes:
>
>> Hmm. I was thinking "am" was the odd man out, but really there are only
>> two sequencer commands that I noted: rebase and am. So you could perhaps
>> argue that rebase should also learn "--resolved". Or am I forgetting
>> one?

Having said all I did in the previous message, I think "am --continue" would be a good addition.

And "rebase --resolved" would not make any sense if the reason the control is given back to you was because you ran "rebase -i" and marked a commit to be "edit"ed. Of course, we could add "--resolved" and "--edited" (or perhaps "--amended") to "rebase", and have it make sure that the correct one is given. For example, when it stopped for "edit", it would reject "rebase --resolved". But I do not think it is worth the hassle.