mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the word 'stuck' instead of 'sticked'

Browse Source 
The past participle of 'stick' is 'stuck'.

Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nicolas Vigier
2013-10-31 12:08:28 +01:00
committed by Junio C Hamano
parent 3d092bfc6f
commit b0d12fc9b2
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/gitcli.txt
View File

@ -72,11 +72,11 @@ scripting Git:
* splitting short options to separate words (prefer `git foo -a -b` * splitting short options to separate words (prefer `git foo -a -b`
to `git foo -ab`, the latter may not even work). to `git foo -ab`, the latter may not even work).
* when a command line option takes an argument, use the 'sticked' form. In * when a command line option takes an argument, use the 'stuck' form. In
other words, write `git foo -oArg` instead of `git foo -o Arg` for short other words, write `git foo -oArg` instead of `git foo -o Arg` for short
options, and `git foo --long-opt=Arg` instead of `git foo --long-opt Arg` options, and `git foo --long-opt=Arg` instead of `git foo --long-opt Arg`
for long options. An option that takes optional option-argument must be for long options. An option that takes optional option-argument must be
written in the 'sticked' form. written in the 'stuck' form.
* when you give a revision parameter to a command, make sure the parameter is * when you give a revision parameter to a command, make sure the parameter is
not ambiguous with a name of a file in the work tree. E.g. do not write not ambiguous with a name of a file in the work tree. E.g. do not write
@ -165,7 +165,7 @@ $ git foo -o Arg
---------------------------- ----------------------------
However, this is *NOT* allowed for switches with an optional value, where the However, this is *NOT* allowed for switches with an optional value, where the
'sticked' form must be used: 'stuck' form must be used:
---------------------------- ----------------------------
$ git describe --abbrev HEAD # correct $ git describe --abbrev HEAD # correct
$ git describe --abbrev=10 HEAD # correct $ git describe --abbrev=10 HEAD # correct

6
Documentation/technical/api-parse-options.txt
View File

@ -29,9 +29,9 @@ that allow to change the behavior of a command.
The parse-options API allows: The parse-options API allows:
* 'sticked' and 'separate form' of options with arguments. * 'stuck' and 'separate form' of options with arguments.
`-oArg` is sticked, `-o Arg` is separate form. `-oArg` is stuck, `-o Arg` is separate form.
`--option=Arg` is sticked, `--option Arg` is separate form. `--option=Arg` is stuck, `--option Arg` is separate form.
* Long options may be 'abbreviated', as long as the abbreviation * Long options may be 'abbreviated', as long as the abbreviation
is unambiguous. is unambiguous.

2
diff.c
View File

@ -3394,7 +3394,7 @@ int parse_long_opt(const char *opt, const char **argv,
if (prefixcmp(arg, opt)) if (prefixcmp(arg, opt))
return 0; return 0;
arg += strlen(opt); arg += strlen(opt);
if (*arg == '=') { /* sticked form: --option=value */ if (*arg == '=') { /* stuck form: --option=value */
*optarg = arg + 1; *optarg = arg + 1;
return 1; return 1;
} }

2
diff.h
View File

@ -244,7 +244,7 @@ extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *pat
#define DIFF_SETUP_USE_SIZE_CACHE 4 #define DIFF_SETUP_USE_SIZE_CACHE 4
/* /*
* Poor man's alternative to parse-option, to allow both sticked form * Poor man's alternative to parse-option, to allow both stuck form
* (--option=value) and separate form (--option value). * (--option=value) and separate form (--option value).
*/ */
extern int parse_long_opt(const char *opt, const char **argv, extern int parse_long_opt(const char *opt, const char **argv,