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>

diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
index 3146413cce0d732e89d5f4e9b3fd519a347ee17d..c87f0ae88d6c5db378ab077c27ac8405ae7c192a 100644 (file)
--- a/Documentation/gitcli.txt
+++ b/Documentation/gitcli.txt
@@ -72,11 +72,11 @@ scripting Git:
  * splitting short options to separate words (prefer `git foo -a -b`
    to `git foo -ab`, the latter may not even work).
 
  * splitting short options to separate words (prefer `git foo -a -b`
    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
    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
    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`
    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
    not ambiguous with a name of a file in the work tree.  E.g. do not write
 
  * 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


@@ -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=10 HEAD  # correct
 ----------------------------
 $ git describe --abbrev HEAD     # correct
 $ git describe --abbrev=10 HEAD  # correct

diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
index 0be2b5159f1b349f0c263eb9e8ba696e2a57ebc0..be50cf4de35c856da051f985eb42c22dbaac88e4 100644 (file)
--- 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:
 
 
 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.
 
 * Long options may be 'abbreviated', as long as the abbreviation
   is unambiguous.

diff --git a/diff.c b/diff.c
index e34bf971207f7737c3b1a10968acd8ffb3ecf93d..3950e01910674c15d8af2c0d5d114402f43b1a9c 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3394,7 +3394,7 @@ int parse_long_opt(const char *opt, const char **argv,
        if (prefixcmp(arg, opt))
                return 0;
        arg += strlen(opt);
        if (prefixcmp(arg, opt))
                return 0;
        arg += strlen(opt);

-       if (*arg == '=') { /* sticked form: --option=value */
+       if (*arg == '=') { /* stuck form: --option=value */

                *optarg = arg + 1;
                return 1;
        }
                *optarg = arg + 1;
                return 1;
        }

diff --git a/diff.h b/diff.h
index e34232501ee8e56a1d245da1c4f95ed8b928a837..1c05b3a6bec6ce90a97efe366614d23133026b00 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -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).
  */
 extern int parse_long_opt(const char *opt, const char **argv,
  * (--option=value) and separate form (--option value).
  */
 extern int parse_long_opt(const char *opt, const char **argv,