Ramkumar Ramachandra wrote: > Parse the instruction sheet in '.git/sequencer/todo' as a list of > (action, operand) pairs, instead of assuming that all instructions use > the same action. Now you can do: > > pick fdc0b12 picked > revert 965fed4 anotherpick > > For cherry-pick and revert, this means that a 'git cherry-pick > --continue' can continue an ongoing revert operation and viceversa. Sounds like a good thing. [...] > --- a/builtin/revert.c > +++ b/builtin/revert.c > @@ -39,7 +39,7 @@ static const char * const cherry_pick_usage[] = { > NULL > }; > > -enum replay_action { REVERT, CHERRY_PICK }; > +enum replay_action { REPLAY_REVERT, REPLAY_PICK }; What does this have to do with it? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html