aboutsummaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-24 15:55:19 -0800
committerJunio C Hamano <gitster@pobox.com>2010-11-24 15:55:19 -0800
commit20f84c8f56519b49fa91bb6cef8f8978c2ab4e09 (patch)
tree506b6dc0c798465251dc065479158b045239a106 /Documentation/technical
parentcbcf0a6981687b31635d806f45e77188c54b7cfc (diff)
parent6e565345e87cf9b8da093e11492fe3a025007230 (diff)
downloadgit-20f84c8f56519b49fa91bb6cef8f8978c2ab4e09.tar.gz
git-20f84c8f56519b49fa91bb6cef8f8978c2ab4e09.tar.xz
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 'Documentation/technical')
-rw-r--r--Documentation/technical/api-parse-options.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
index c5d141cd6..f6a4a361b 100644
--- a/Documentation/technical/api-parse-options.txt
+++ b/Documentation/technical/api-parse-options.txt
@@ -118,13 +118,16 @@ There are some macros to easily define options:
`OPT__COLOR(&int_var, description)`::
Add `\--color[=<when>]` and `--no-color`.
-`OPT__DRY_RUN(&int_var)`::
+`OPT__DRY_RUN(&int_var, description)`::
Add `-n, \--dry-run`.
-`OPT__QUIET(&int_var)`::
+`OPT__FORCE(&int_var, description)`::
+ Add `-f, \--force`.
+
+`OPT__QUIET(&int_var, description)`::
Add `-q, \--quiet`.
-`OPT__VERBOSE(&int_var)`::
+`OPT__VERBOSE(&int_var, description)`::
Add `-v, \--verbose`.
`OPT_GROUP(description)`::