I have used bits from your email. I forgot to add "Helped-by: Junio C Hamano <gitster@xxxxxxxxx>" . Could you squash it in? On Sat, Mar 26, 2016 at 12:28 AM, Pranit Bauva <pranit.bauva@xxxxxxxxx> wrote: > OPT_CMDMODE mechanism was introduced in the release of 1.8.5 to actively > notice when multiple "operation mode" options that specify mutually > incompatible operation modes are given. > > Signed-off-by: Pranit Bauva <pranit.bauva@xxxxxxxxx> > --- > Documentation/technical/api-parse-options.txt | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt > index 5f0757d..695bd4b 100644 > --- a/Documentation/technical/api-parse-options.txt > +++ b/Documentation/technical/api-parse-options.txt > @@ -231,6 +231,13 @@ There are some macros to easily define options: > pass the command-line option, which can be specified multiple times, > to another command. > > +`OPT_CMDMODE(short, long, &int_var, description, enum_val)`:: > + Define an "operation mode" option, only one of which in the same > + group of "operating mode" options that share the same `int_var` > + can be given by the user. `enum_val` is set to `int_var` when the > + option is used, but an error is reported if other "operating mode" > + option has already set its value to the same `int_var`. > + > > The last element of the array must be `OPT_END()`. > > > -- > https://github.com/git/git/pull/219 > -- > 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 -- 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