diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-25 00:59:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-25 00:59:29 -0700 |
| commit | b064e2fc3d197c3c691fe89c43d1bf79f64fcdf7 (patch) | |
| tree | cbb39054fa81329ff874cb71679221af448583dc /parse-options.h | |
| parent | ee969693c5e77e1b5ebda45bead569806d31b379 (diff) | |
| parent | 57343652a55bdc3e7f3cf8c6def94dac482c72e5 (diff) | |
| download | git-b064e2fc3d197c3c691fe89c43d1bf79f64fcdf7.tar.gz | |
Merge branch 'sb/show-branch-parse-options' into sb/opt-filename
* sb/show-branch-parse-options:
show-branch: migrate to parse-options API
parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's
Conflicts:
parse-options.h
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/parse-options.h b/parse-options.h index 919b9b441f..fe41ab2c67 100644 --- a/parse-options.h +++ b/parse-options.h @@ -34,6 +34,7 @@ enum parse_opt_option_flags { PARSE_OPT_HIDDEN = 8, PARSE_OPT_LASTARG_DEFAULT = 16, PARSE_OPT_NODASH = 32, + PARSE_OPT_LITERAL_ARGHELP = 64, }; struct option; @@ -72,6 +73,9 @@ typedef int parse_opt_cb(const struct option *, const char *arg, int unset); * PARSE_OPT_LASTARG_DEFAULT: if no argument is given, the default value * is used. * PARSE_OPT_NODASH: this option doesn't start with a dash. + * PARSE_OPT_LITERAL_ARGHELP: says that argh shouldn't be enclosed in brackets + * (i.e. '<argh>') in the help message. + * Useful for options with multiple parameters. * * `callback`:: * pointer to the callback to use for OPTION_CALLBACK. |