From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Feb 2008 19:42:00 GMT
Subject: Re: [RFC] Issues around C rebase--interactive
Message-ID: <7vablzz7xz.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <alpine.LNX.1.00.0802171347060.5816@iabervon.org>

Daniel Barkalow <barkalow@iabervon.org> writes:

> ... I think it would be good 
> to have a "git abort" that would reset a conflicted merge, abort a rebase, 

Yes, we would want a consolidated "git sequencer" that can be
reused by "am" and "rebase".  The command set to the sequencer
would be a slight superset to what rebase--interactive uses in
its todo file, I would imagine.  To support "am" (and non-merge
version of "rebase") it would add "apply <filename>" command.