diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-24 15:55:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-24 15:55:19 -0800 |
| commit | 20f84c8f56519b49fa91bb6cef8f8978c2ab4e09 (patch) | |
| tree | 506b6dc0c798465251dc065479158b045239a106 /parse-options.h | |
| parent | Merge branch 'kb/maint-rebase-autosquash' (diff) | |
| parent | verify-tag: document --verbose (diff) | |
| download | git-20f84c8f56519b49fa91bb6cef8f8978c2ab4e09.tar.gz git-20f84c8f56519b49fa91bb6cef8f8978c2ab4e09.zip | |
Merge branch 'rs/opt-help-text'
* rs/opt-help-text:
verify-tag: document --verbose
branch: improve --verbose description
archive: improve --verbose description
Describe various forms of "be quiet" using OPT__QUIET
add OPT__FORCE
add description parameter to OPT__QUIET
add description parameter to OPT__DRY_RUN
add description parameter to OPT__VERBOSE
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/parse-options.h b/parse-options.h index d982f0f1bf..ae8647d893 100644 --- a/parse-options.h +++ b/parse-options.h @@ -198,14 +198,15 @@ extern int parse_opt_verbosity_cb(const struct option *, const char *, int); extern int parse_opt_with_commit(const struct option *, const char *, int); extern int parse_opt_tertiary(const struct option *, const char *, int); -#define OPT__VERBOSE(var) OPT_BOOLEAN('v', "verbose", (var), "be verbose") -#define OPT__QUIET(var) OPT_BOOLEAN('q', "quiet", (var), "be quiet") +#define OPT__VERBOSE(var, h) OPT_BOOLEAN('v', "verbose", (var), (h)) +#define OPT__QUIET(var, h) OPT_BOOLEAN('q', "quiet", (var), (h)) #define OPT__VERBOSITY(var) \ { OPTION_CALLBACK, 'v', "verbose", (var), NULL, "be more verbose", \ PARSE_OPT_NOARG, &parse_opt_verbosity_cb, 0 }, \ { OPTION_CALLBACK, 'q', "quiet", (var), NULL, "be more quiet", \ PARSE_OPT_NOARG, &parse_opt_verbosity_cb, 0 } -#define OPT__DRY_RUN(var) OPT_BOOLEAN('n', "dry-run", (var), "dry run") +#define OPT__DRY_RUN(var, h) OPT_BOOLEAN('n', "dry-run", (var), (h)) +#define OPT__FORCE(var, h) OPT_BOOLEAN('f', "force", (var), (h)) #define OPT__ABBREV(var) \ { OPTION_CALLBACK, 0, "abbrev", (var), "n", \ "use <n> digits to display SHA-1s", \ |