Daniel Barkalow [off-list ref] 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.