Use the word 'stuck' instead of 'sticked'
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>
Nicolas Vigier committed
Oct 31, 2013 at 12:08 UTC
b0d12fc9b23a0f656fe3a5dbe2899e85b7e2f5c0
4 files changed
+8
-8
Documentation/gitcli.txt
+3
-3
@@ -72,11 +72,11 @@ scripting Git:
72
* splitting short options to separate words (prefer `git foo -a -b`
73
to `git foo -ab`, the latter may not even work).
74
75
- * when a command line option takes an argument, use the 'sticked' form. In
75
+ * when a command line option takes an argument, use the 'stuck' form. In
76
other words, write `git foo -oArg` instead of `git foo -o Arg` for short
77
options, and `git foo --long-opt=Arg` instead of `git foo --long-opt Arg`
78
for long options. An option that takes optional option-argument must be
79
- written in the 'sticked' form.
79
+ written in the 'stuck' form.
80
81
* when you give a revision parameter to a command, make sure the parameter is
82
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
165
----------------------------
166
167
However, this is *NOT* allowed for switches with an optional value, where the
168
-'sticked' form must be used:
168
+'stuck' form must be used:
169
----------------------------
170
$ git describe --abbrev HEAD # correct
171
$ git describe --abbrev=10 HEAD # correct
Documentation/technical/api-parse-options.txt
+3
-3
@@ -29,9 +29,9 @@ that allow to change the behavior of a command.
29
30
The parse-options API allows:
31
32
-* 'sticked' and 'separate form' of options with arguments.
33
- `-oArg` is sticked, `-o Arg` is separate form.
34
- `--option=Arg` is sticked, `--option Arg` is separate form.
32
+* 'stuck' and 'separate form' of options with arguments.
33
+ `-oArg` is stuck, `-o Arg` is separate form.
34
+ `--option=Arg` is stuck, `--option Arg` is separate form.
35
36
* Long options may be 'abbreviated', as long as the abbreviation
37
is unambiguous.
diff.c
+1
-1
@@ -3394,7 +3394,7 @@ int parse_long_opt(const char *opt, const char **argv,
3394
if (prefixcmp(arg, opt))
3395
return 0;
3396
arg += strlen(opt);
3397
- if (*arg == '=') { /* sticked form: --option=value */
3397
+ if (*arg == '=') { /* stuck form: --option=value */
3398
*optarg = arg + 1;
3399
return 1;
3400
}
diff.h
+1
-1
@@ -244,7 +244,7 @@ extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *pat
244
#define DIFF_SETUP_USE_SIZE_CACHE 4
245
246
/*
247
- * Poor man's alternative to parse-option, to allow both sticked form
247
+ * Poor man's alternative to parse-option, to allow both stuck form
248
* (--option=value) and separate form (--option value).
249
*/
250
extern int parse_long_opt(const char *opt, const char **argv,