diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-12-06 15:43:18 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-12-06 15:43:18 -0800 |
commit | f079f7094a3ce05d8f51729b0f0b6bf2ed594114 (patch) | |
tree | 0ab71b025061dae8f2ec4629d129447c437728c4 /gitcli.html | |
parent | b73af6c3bb75d464c5816f310eafe4af58c158a7 (diff) | |
download | git-htmldocs-f079f7094a3ce05d8f51729b0f0b6bf2ed594114.tar.gz |
Autogenerated HTML docs for v1.8.5.1-93-g077f4
Diffstat (limited to 'gitcli.html')
-rw-r--r-- | gitcli.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gitcli.html b/gitcli.html index 9f2e113b4..ff625a3be 100644 --- a/gitcli.html +++ b/gitcli.html @@ -831,11 +831,11 @@ splitting short options to separate words (prefer <code>git foo -a -b</code> </li>
<li>
<p>
-when a command line option takes an argument, use the <em>sticked</em> form. In
+when a command line option takes an argument, use the <em>stuck</em> form. In
other words, write <code>git foo -oArg</code> instead of <code>git foo -o Arg</code> for short
options, and <code>git foo --long-opt=Arg</code> instead of <code>git foo --long-opt Arg</code>
for long options. An option that takes optional option-argument must be
- written in the <em>sticked</em> form.
+ written in the <em>stuck</em> form.
</p>
</li>
<li>
@@ -938,7 +938,7 @@ $ git foo -oArg $ git foo -o Arg</code></pre>
</div></div>
<div class="paragraph"><p>However, this is <strong>NOT</strong> allowed for switches with an optional value, where the
-<em>sticked</em> form must be used:</p></div>
+<em>stuck</em> form must be used:</p></div>
<div class="listingblock">
<div class="content">
<pre><code>$ git describe --abbrev HEAD # correct
@@ -1001,7 +1001,7 @@ information.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-12-03 14:06:33 PST
+Last updated 2013-12-06 15:42:42 PST
</div>
</div>
</body>
|