summaryrefslogtreecommitdiffstats
path: root/git-rev-parse.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-08 12:48:38 -0700
committerJunio C Hamano <gitster@pobox.com>2014-04-08 12:48:38 -0700
commitd75148af8e54fe1d655796c75a601e5f79804808 (patch)
tree1aed2433cb2e2d7db853a72387f48ec081ce01dc /git-rev-parse.html
parent624dd4c072be7e13e57519eb729f35089386fec9 (diff)
downloadgit-htmldocs-d75148af8e54fe1d655796c75a601e5f79804808.tar.gz
Autogenerated HTML docs for v1.9.1-506-g7bf27
Diffstat (limited to 'git-rev-parse.html')
-rw-r--r--git-rev-parse.html20
1 files changed, 10 insertions, 10 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html
index 72892e701..5f4aa22ec 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -1647,18 +1647,18 @@ The lines after the separator describe the options.</p></div>
<div class="paragraph"><p>Each line of options has this format:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>&lt;opt_spec&gt;&lt;flags&gt;*&lt;arg_hint&gt;? SP+ help LF</tt></pre>
+<pre><tt>&lt;opt-spec&gt;&lt;flags&gt;*&lt;arg-hint&gt;? SP+ help LF</tt></pre>
</div></div>
<div class="dlist"><dl>
<dt class="hdlist1">
-<tt>&lt;opt_spec&gt;</tt>
+<tt>&lt;opt-spec&gt;</tt>
</dt>
<dd>
<p>
its format is the short option character, then the long option name
separated by a comma. Both parts are not required, though at least one
is necessary. <tt>h,help</tt>, <tt>dry-run</tt> and <tt>f</tt> are all three correct
- <tt>&lt;opt_spec&gt;</tt>.
+ <tt>&lt;opt-spec&gt;</tt>.
</p>
</dd>
<dt class="hdlist1">
@@ -1696,14 +1696,14 @@ Use <tt>!</tt> to not make the corresponding negated long option available.
</ul></div>
</dd>
<dt class="hdlist1">
-<tt>&lt;arg_hint&gt;</tt>
+<tt>&lt;arg-hint&gt;</tt>
</dt>
<dd>
<p>
- <tt>&lt;arg_hint&gt;</tt>, if specified, is used as a name of the argument in the
- help output, for options that take arguments. <tt>&lt;arg_hint&gt;</tt> is
- terminated by the first whitespace. When you need to use space in the
- argument hint use dash instead.
+ <tt>&lt;arg-hint&gt;</tt>, if specified, is used as a name of the argument in the
+ help output, for options that take arguments. <tt>&lt;arg-hint&gt;</tt> is
+ terminated by the first whitespace. It is customary to use a
+ dash to separate words in a multi-word argument hint.
</p>
</dd>
</dl></div>
@@ -1748,7 +1748,7 @@ usage text would be shown:</p></div>
-h, --help show the help
--foo some nifty option --foo
--bar ... some cool option --bar with an argument
- --bar &lt;arg&gt; another cool option --baz with a named argument
+ --baz &lt;arg&gt; another cool option --baz with a named argument
--qux[=&lt;path&gt;] qux may take a path argument but has meaning by itself
An option group Header
@@ -1830,7 +1830,7 @@ Similar to above:
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-03-31 17:26:22 PDT
+Last updated 2014-04-08 12:47:26 PDT
</div>
</div>
</body>