summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mars-attacks.org>2013-10-31 11:08:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-10-31 22:47:38 (GMT)
commitb0d12fc9b23a0f656fe3a5dbe2899e85b7e2f5c0 (patch)
treecc88e52cbeb9f90ea911dfca407b98ad36272c6b /Documentation
parent3d092bfc6f2d9a998967979f926c661e9762601c (diff)
downloadgit-b0d12fc9b23a0f656fe3a5dbe2899e85b7e2f5c0.zip
git-b0d12fc9b23a0f656fe3a5dbe2899e85b7e2f5c0.tar.gz
git-b0d12fc9b23a0f656fe3a5dbe2899e85b7e2f5c0.tar.bz2
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitcli.txt6
-rw-r--r--Documentation/technical/api-parse-options.txt6
2 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
index 3146413..c87f0ae 100644
--- 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).
- * 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
- 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
@@ -165,7 +165,7 @@ $ git foo -o Arg
----------------------------
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
diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
index 0be2b51..be50cf4 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.