diff options
author | Nicolas Vigier <boklm@mars-attacks.org> | 2013-10-31 12:08:28 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-10-31 15:47:38 -0700 |
commit | b0d12fc9b23a0f656fe3a5dbe2899e85b7e2f5c0 (patch) | |
tree | cc88e52cbeb9f90ea911dfca407b98ad36272c6b /Documentation/gitcli.txt | |
parent | 3d092bfc6f2d9a998967979f926c661e9762601c (diff) | |
download | git-b0d12fc9b23a0f656fe3a5dbe2899e85b7e2f5c0.tar.gz |
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/gitcli.txt')
-rw-r--r-- | Documentation/gitcli.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index 3146413cce..c87f0ae88d 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 |