summaryrefslogtreecommitdiffstats
path: root/gitcli.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-09-19 06:37:10 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-09-19 06:37:10 +0000
commit4604fe5609a48fc240d1a88a15c642c9883363c7 (patch)
tree846c5b418d438e9580d0a7702be832f1d1d9874c /gitcli.html
parent5e4d8dee8bb242deb8fd16e7dcd74a0e7fb713d2 (diff)
downloadgit-htmldocs-4604fe5609a48fc240d1a88a15c642c9883363c7.tar.gz
Autogenerated HTML docs for v1.6.0.2-287-g3791f
Diffstat (limited to 'gitcli.html')
-rw-r--r--gitcli.html164
1 files changed, 106 insertions, 58 deletions
diff --git a/gitcli.html b/gitcli.html
index 1ec6b6faa..9ad3099ac 100644
--- a/gitcli.html
+++ b/gitcli.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.2" />
+<meta name="generator" content="AsciiDoc 8.2.5" />
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -16,8 +16,13 @@ body {
margin: 1em 5% 1em 5%;
}
-a { color: blue; }
-a:visited { color: fuchsia; }
+a {
+ color: blue;
+ text-decoration: underline;
+}
+a:visited {
+ color: fuchsia;
+}
em {
font-style: italic;
@@ -39,13 +44,18 @@ h1, h2, h3, h4, h5, h6 {
line-height: 1.3;
}
-h1 {
+h1, h2, h3 {
border-bottom: 2px solid silver;
}
h2 {
- border-bottom: 2px solid silver;
padding-top: 0.5em;
}
+h3 {
+ float: left;
+}
+h3 + * {
+ clear: left;
+}
div.sectionbody {
font-family: serif;
@@ -70,7 +80,7 @@ span#author {
color: #527bbd;
font-family: sans-serif;
font-weight: bold;
- font-size: 1.2em;
+ font-size: 1.1em;
}
span#email {
}
@@ -139,6 +149,9 @@ div.sidebarblock > div.content {
padding: 0.5em;
}
+div.listingblock {
+ margin-right: 0%;
+}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
@@ -148,9 +161,13 @@ div.listingblock > div.content {
div.quoteblock > div.content {
padding-left: 2.0em;
}
-div.quoteblock .attribution {
+
+div.attribution {
text-align: right;
}
+div.verseblock + div.attribution {
+ text-align: left;
+}
div.admonitionblock .icon {
vertical-align: top;
@@ -194,13 +211,12 @@ dd > *:first-child {
ul, ol {
list-style-position: outside;
}
-ol.olist2 {
+div.olist2 ol {
list-style-type: lower-alpha;
}
div.tableblock > table {
- border-color: #527bbd;
- border-width: 3px;
+ border: 3px solid #527bbd;
}
thead {
font-family: sans-serif;
@@ -214,6 +230,9 @@ div.hlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
+div.hlist td {
+ padding-bottom: 5px;
+}
td.hlist1 {
vertical-align: top;
font-style: italic;
@@ -226,7 +245,33 @@ td.hlist2 {
@media print {
div#footer-badges { display: none; }
}
-include::./stylesheets/xhtml11-manpage.css[]
+
+div#toctitle {
+ color: #527bbd;
+ font-family: sans-serif;
+ font-size: 1.1em;
+ font-weight: bold;
+ margin-top: 1.0em;
+ margin-bottom: 0.1em;
+}
+
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+div.toclevel2 {
+ margin-left: 2em;
+ font-size: 0.9em;
+}
+div.toclevel3 {
+ margin-left: 4em;
+ font-size: 0.9em;
+}
+div.toclevel4 {
+ margin-left: 6em;
+ font-size: 0.9em;
+}
+include1::./stylesheets/xhtml11-manpage.css[]
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -255,6 +300,9 @@ div.exampleblock-content {
border-left: 2px solid silver;
padding-left: 0.5em;
}
+
+/* IE6 sets dynamically generated links as visited. */
+div#toc a:visited { color: blue; }
</style>
<title>gitcli(7)</title>
</head>
@@ -272,15 +320,15 @@ gitcli(7) Manual Page
</div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p>gitcli</p>
+<div class="para"><p>gitcli</p></div>
</div>
-<h2>DESCRIPTION</h2>
+<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<p>This manual describes the convention used throughout git CLI.</p>
-<p>Many commands take revisions (most often "commits", but sometimes
+<div class="para"><p>This manual describes the convention used throughout git CLI.</p></div>
+<div class="para"><p>Many commands take revisions (most often "commits", but sometimes
"tree-ish", depending on the context and command) and paths as their
-arguments. Here are the rules:</p>
-<ul>
+arguments. Here are the rules:</p></div>
+<div class="ilist"><ul>
<li>
<p>
Revisions come first and then paths.
@@ -309,13 +357,13 @@ Without disambiguating <tt>--</tt>, git makes a reasonable guess, but errors
disambiguate.
</p>
</li>
-</ul>
-<p>When writing a script that is expected to handle random user-input, it is
+</ul></div>
+<div class="para"><p>When writing a script that is expected to handle random user-input, it is
a good practice to make it explicit which arguments are which by placing
-disambiguating <tt>--</tt> at appropriate places.</p>
-<p>Here are the rules regarding the "flags" that you should follow when you are
-scripting git:</p>
-<ul>
+disambiguating <tt>--</tt> at appropriate places.</p></div>
+<div class="para"><p>Here are the rules regarding the "flags" that you should follow when you are
+scripting git:</p></div>
+<div class="ilist"><ul>
<li>
<p>
it's preferred to use the non dashed form of git commands, which means that
@@ -345,17 +393,17 @@ when you give a revision parameter to a command, make sure the parameter is
if you happen to have a file called <tt>HEAD</tt> in the work tree.
</p>
</li>
-</ul>
+</ul></div>
</div>
-<h2>ENHANCED OPTION PARSER</h2>
+<h2 id="_enhanced_option_parser">ENHANCED OPTION PARSER</h2>
<div class="sectionbody">
-<p>From the git 1.5.4 series and further, many git commands (not all of them at the
-time of the writing though) come with an enhanced option parser.</p>
-<p>Here is an exhaustive list of the facilities provided by this option parser.</p>
-<h3>Magic Options</h3>
-<p>Commands which have the enhanced option parser activated all understand a
-couple of magic command line options:</p>
-<dl>
+<div class="para"><p>From the git 1.5.4 series and further, many git commands (not all of them at the
+time of the writing though) come with an enhanced option parser.</p></div>
+<div class="para"><p>Here is an exhaustive list of the facilities provided by this option parser.</p></div>
+<h3 id="_magic_options">Magic Options</h3><div style="clear:left"></div>
+<div class="para"><p>Commands which have the enhanced option parser activated all understand a
+couple of magic command line options:</p></div>
+<div class="vlist"><dl>
<dt>
-h
</dt>
@@ -386,19 +434,19 @@ usage: git-describe [options] &lt;committish&gt;*
option gives the full list of options.
</p>
</dd>
-</dl>
-<h3>Negating options</h3>
-<p>Options with long option names can be negated by prefixing <tt>"--no-"</tt>. For
+</dl></div>
+<h3 id="_negating_options">Negating options</h3><div style="clear:left"></div>
+<div class="para"><p>Options with long option names can be negated by prefixing <tt>"--no-"</tt>. For
example, <tt>"git branch"</tt> has the option <tt>"--track"</tt> which is <em>on</em> by default. You
can use <tt>"--no-track"</tt> to override that behaviour. The same goes for <tt>"--color"</tt>
-and <tt>"--no-color"</tt>.</p>
-<h3>Aggregating short options</h3>
-<p>Commands that support the enhanced option parser allow you to aggregate short
+and <tt>"--no-color"</tt>.</p></div>
+<h3 id="_aggregating_short_options">Aggregating short options</h3><div style="clear:left"></div>
+<div class="para"><p>Commands that support the enhanced option parser allow you to aggregate short
options. This means that you can for example use <tt>"git rm -rf"</tt> or
-<tt>"git clean -fdx"</tt>.</p>
-<h3>Separating argument from the option</h3>
-<p>You can write the mandatory option parameter to an option as a separate
-word on the command line. That means that all the following uses work:</p>
+<tt>"git clean -fdx"</tt>.</p></div>
+<h3 id="_separating_argument_from_the_option">Separating argument from the option</h3><div style="clear:left"></div>
+<div class="para"><p>You can write the mandatory option parameter to an option as a separate
+word on the command line. That means that all the following uses work:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git foo --long-opt=Arg
@@ -406,8 +454,8 @@ $ git foo --long-opt Arg
$ git foo -oArg
$ git foo -o Arg</tt></pre>
</div></div>
-<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 class="para"><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>
<div class="listingblock">
<div class="content">
<pre><tt>$ git describe --abbrev HEAD # correct
@@ -415,15 +463,15 @@ $ git describe --abbrev=10 HEAD # correct
$ git describe --abbrev 10 HEAD # NOT WHAT YOU MEANT</tt></pre>
</div></div>
</div>
-<h2>NOTES ON FREQUENTLY CONFUSED OPTIONS</h2>
+<h2 id="_notes_on_frequently_confused_options">NOTES ON FREQUENTLY CONFUSED OPTIONS</h2>
<div class="sectionbody">
-<p>Many commands that can work on files in the working tree
+<div class="para"><p>Many commands that can work on files in the working tree
and/or in the index can take <tt>--cached</tt> and/or <tt>--index</tt>
options. Sometimes people incorrectly think that, because
the index was originally called cache, these two are
synonyms. They are <strong>not</strong> &#8212; these two options mean very
-different things.</p>
-<ul>
+different things.</p></div>
+<div class="ilist"><ul>
<li>
<p>
The <tt>--cached</tt> option is used to ask a command that
@@ -445,28 +493,28 @@ The <tt>--index</tt> option is used to ask a command that
the index as well.
</p>
</li>
-</ul>
-<p><tt>git apply</tt> command can be used with <tt>--cached</tt> and
+</ul></div>
+<div class="para"><p><tt>git apply</tt> command can be used with <tt>--cached</tt> and
<tt>--index</tt> (but not at the same time). Usually the command
only affects the files in the working tree, but with
<tt>--index</tt>, it patches both the files and their index
entries, and with <tt>--cached</tt>, it modifies only the index
-entries.</p>
-<p>See also http://marc.info/?l=git&amp;m=116563135620359 and
+entries.</p></div>
+<div class="para"><p>See also http://marc.info/?l=git&amp;m=116563135620359 and
http://marc.info/?l=git&amp;m=119150393620273 for further
-information.</p>
+information.</p></div>
</div>
-<h2>Documentation</h2>
+<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
-<p>Documentation by Pierre Habouzit and the git-list &lt;git@vger.kernel.org&gt;.</p>
+<div class="para"><p>Documentation by Pierre Habouzit and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
</div>
-<h2>GIT</h2>
+<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<p>Part of the <a href="git.html">git(1)</a> suite</p>
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 02-Jul-2008 03:02:11 UTC
+Last updated 2008-09-19 06:33:21 UTC
</div>
</div>
</body>