From: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri, 09 Dec 2011 20:26:45 GMT
Subject: Re: [PATCH 7/9] revert: allow mixed pick and revert instructions
Message-ID: <20111209202645.GJ20913@elie.hsd1.il.comcast.net>
In-Reply-To: <1323445326-24637-8-git-send-email-artagnon@gmail.com>

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?