summaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-02-27 21:57:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-02-27 21:57:11 (GMT)
commit1b324988ac0fe14d069991736962289a35f15aec (patch)
treec2cfb5556541cd671699cade50a8dbb23174c19d /Documentation/technical
parente7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7 (diff)
parent77d21f29eaddb1fbe82e013ea42d4e0180bbdda2 (diff)
downloadgit-1b324988ac0fe14d069991736962289a35f15aec.zip
git-1b324988ac0fe14d069991736962289a35f15aec.tar.gz
git-1b324988ac0fe14d069991736962289a35f15aec.tar.bz2
Merge branch 'jk/describe-omit-some-refs'
"git describe" and "git name-rev" have been taught to take more than one refname patterns to restrict the set of refs to base their naming output on, and also learned to take negative patterns to name refs not to be used for naming via their "--exclude" option. * jk/describe-omit-some-refs: describe: teach describe negative pattern matches describe: teach --match to accept multiple patterns name-rev: add support to exclude refs by pattern match name-rev: extend --refs to accept multiple patterns doc: add documentation for OPT_STRING_LIST
Diffstat (limited to 'Documentation/technical')
-rw-r--r--Documentation/technical/api-parse-options.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
index 27bd701..36768b4 100644
--- a/Documentation/technical/api-parse-options.txt
+++ b/Documentation/technical/api-parse-options.txt
@@ -168,6 +168,11 @@ There are some macros to easily define options:
Introduce an option with string argument.
The string argument is put into `str_var`.
+`OPT_STRING_LIST(short, long, &struct string_list, arg_str, description)`::
+ Introduce an option with string argument.
+ The string argument is stored as an element in `string_list`.
+ Use of `--no-option` will clear the list of preceding values.
+
`OPT_INTEGER(short, long, &int_var, description)`::
Introduce an option with integer argument.
The integer is put into `int_var`.