Re: [PATCH v2 01/14] Add proper 'stage' command

2013-10-14 Thread Felipe Contreras
On Mon, Oct 14, 2013 at 6:06 PM, Eric Sunshine  wrote:
> On Mon, Oct 14, 2013 at 6:29 PM, Felipe Contreras
>  wrote:
>> diff --git a/builtin/stage.c b/builtin/stage.c
>> new file mode 100644
>> index 000..3023d17
>> --- /dev/null
>> +++ b/builtin/stage.c
>> @@ -0,0 +1,52 @@
>> +/*
>> + * 'git stage' builtin command
>> + *
>> + * Copyright (C) 2013 Felipe Contreras
>> + */
>> +
>> +#include "builtin.h"
>> +#include "parse-options.h"
>> +
>> +static const char *const stage_usage[] = {
>> +   N_("git stage [options] [--] ..."),
>> +   N_("git stage add [options] [--] ..."),
>> +   N_("git stage reset [-q|--patch] [--] ..."),
>> +   N_("git stage diff [options] [ [--] ..."),
>> +   N_("git stage rm [options] [--] ..."),
>> +   NULL
>> +};
>
> Sent the wrong set of patches? The interdiff in the cover letter
> showed usage for "git stage apply", but it's not here in the actual
> patch.

No, it's the right series, but apparently I added the change to the
wrong commit: stage: add edit command. I've fixed that and will send
it on the next reroll (if there's any).

-- 
Felipe Contreras
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH v2 01/14] Add proper 'stage' command

2013-10-14 Thread Eric Sunshine
On Mon, Oct 14, 2013 at 6:29 PM, Felipe Contreras
 wrote:
> diff --git a/builtin/stage.c b/builtin/stage.c
> new file mode 100644
> index 000..3023d17
> --- /dev/null
> +++ b/builtin/stage.c
> @@ -0,0 +1,52 @@
> +/*
> + * 'git stage' builtin command
> + *
> + * Copyright (C) 2013 Felipe Contreras
> + */
> +
> +#include "builtin.h"
> +#include "parse-options.h"
> +
> +static const char *const stage_usage[] = {
> +   N_("git stage [options] [--] ..."),
> +   N_("git stage add [options] [--] ..."),
> +   N_("git stage reset [-q|--patch] [--] ..."),
> +   N_("git stage diff [options] [ [--] ..."),
> +   N_("git stage rm [options] [--] ..."),
> +   NULL
> +};

Sent the wrong set of patches? The interdiff in the cover letter
showed usage for "git stage apply", but it's not here in the actual
patch.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html