diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-12-05 12:59:03 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-12-05 12:59:04 -0800 |
commit | 3576f113cb3f36b9e2b36a84573754a922f2998b (patch) | |
tree | 6a37475bcceb021ee9b3f2345abac1dd4078c9e6 /Documentation/technical | |
parent | Merge branch 'bc/http-100-continue' (diff) | |
parent | rev-parse --parseopt: add the --stuck-long mode (diff) | |
download | tgif-3576f113cb3f36b9e2b36a84573754a922f2998b.tar.xz |
Merge branch 'nv/parseopt-opt-arg'
Enhance "rev-parse --parseopt" mode to help parsing options with
an optional parameter.
* nv/parseopt-opt-arg:
rev-parse --parseopt: add the --stuck-long mode
Use the word 'stuck' instead of 'sticked'
Diffstat (limited to 'Documentation/technical')
-rw-r--r-- | Documentation/technical/api-parse-options.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt index 0be2b5159f..be50cf4de3 100644 --- a/Documentation/technical/api-parse-options.txt +++ b/Documentation/technical/api-parse-options.txt @@ -29,9 +29,9 @@ that allow to change the behavior of a command. The parse-options API allows: -* 'sticked' and 'separate form' of options with arguments. - `-oArg` is sticked, `-o Arg` is separate form. - `--option=Arg` is sticked, `--option Arg` is separate form. +* 'stuck' and 'separate form' of options with arguments. + `-oArg` is stuck, `-o Arg` is separate form. + `--option=Arg` is stuck, `--option Arg` is separate form. * Long options may be 'abbreviated', as long as the abbreviation is unambiguous. |