From: Sverre Rabbelier Date: Wed, 10 Feb 2010 22:23:29 GMT Subject: Re: git cherry-pick --continue? Message-ID: In-Reply-To: <7vbpfw3f6t.fsf@alter.siamese.dyndns.org> Heya, On Wed, Feb 10, 2010 at 23:21, Junio C Hamano wrote: > Having said all I did in the previous message, I think "am --continue" > would be a good addition. How about 'cherry-pick --resolved' though ;). > 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. I don't see any benefit to that, in fact, I'd recommend against it. -- Cheers, Sverre Rabbelier