From: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed, 06 Jul 2011 19:56:10 GMT
Subject: Re: [PATCH 12/14] revert: Introduce --reset to cleanup sequencer data
Message-ID: <20110706195610.GA23984@elie>
In-Reply-To: <20110706192141.GA23516@elie>

Jonathan Nieder wrote:
> Ramkumar Ramachandra wrote:

>> and it's
>> possible to achieve this effect in another way: when a conflict is
>> encountered in the sequencer && length(todo_file) == 1, throw away the
>> sequencer state.
>
> Yep, that seems like basically the same effect.  Are there downsides?
> (Maybe years from now when a "git cherry-pick --rewind" is introduced
> we would regret this?  But that can be figured out years from now.)

Doh, I'm not thinking straight.  Would this break "git cherry-pick
--abort", or is there some hack layered on top to avoid that?  Making
"git commit" remove the .git/sequencer for the last commit of the
sequence seems a little saner.