From: Eugene Sajine <euguess@gmail.com>
Date: Wed, 28 Apr 2010 20:05:43 GMT
Subject: Re: Proper way to abort incorrect cherry-picking?
Message-ID: <s2l76c5b8581004281305i839693d6l400d4d7e1ca86e98@mail.gmail.com>
In-Reply-To: <20100428195001.GA2242@progeny.tock>

On Wed, Apr 28, 2010 at 3:50 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
> Eugene Sajine wrote:
>
>> the automatic cherry-pick failed and caused conflicts, so in
>> order to to cancel the whole operation i had to do the following:
>>
>> 1. mark the conflicting files as resolved (without even resolving
>> them) by doing git add.
>> 2. unstage all files staged for commit as a result of incomplete cherry picking
>> 3. manually checkout touched files to their correct state (git checkout file)
>>
>> and then i was able to repeat cherry-picking with correct commits.
>>
>> Is there a better way?
>
> git reset --merge
>
> Ideas for where this should be put in the git-cherry-pick.txt manual?
>

That's interesting - thanks a lot!

Yes, it wold be nice to have it mentioned somewhere in help for cherry-picking.

Thanks,
Eugene