diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 15:32:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 15:32:51 -0700 |
| commit | ac12f0ed6289c50e645af6dfb6e063776bc0f428 (patch) | |
| tree | 9033ab4b78ce9c9122fbe9b5abcf23d596ea24fd /git.html | |
| parent | c3f8d8ffe5fd51ed0a3dae59dd8b78f61d7b43d2 (diff) | |
| download | git-htmldocs-ac12f0ed6289c50e645af6dfb6e063776bc0f428.tar.gz | |
Autogenerated HTML docs for v2.1.1-273-g97b886
Diffstat (limited to 'git.html')
| -rw-r--r-- | git.html | 150 |
1 files changed, 74 insertions, 76 deletions
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.6" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
<title>git(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,10 +87,16 @@ ul, ol, li > p { ul > li { color: #aaa; }
ul > li > * { color: black; }
-pre {
+.monospaced, code, pre {
+ font-family: "Courier New", Courier, monospace;
+ font-size: inherit;
+ color: navy;
padding: 0;
margin: 0;
}
+pre {
+ white-space: pre-wrap;
+}
#author {
color: #527bbd;
@@ -219,7 +225,7 @@ div.exampleblock > div.content { }
div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
+span.image img { border-style: none; vertical-align: text-bottom; }
a.image:visited { color: white; }
dl {
@@ -349,7 +355,7 @@ div.colist td img { margin-bottom: 0.1em;
}
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
@@ -407,18 +413,14 @@ span.underline { text-decoration: underline; } span.overline { text-decoration: overline; }
span.line-through { text-decoration: line-through; }
+div.unbreakable { page-break-inside: avoid; }
+
/*
* xhtml11 specific
*
* */
-tt {
- font-family: monospace;
- font-size: inherit;
- color: navy;
-}
-
div.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -452,12 +454,6 @@ div.tableblock > table[frame="vsides"] { *
* */
-.monospaced {
- font-family: monospace;
- font-size: inherit;
- color: navy;
-}
-
table.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -537,6 +533,8 @@ body.manpage div.sectionbody { @media print {
body.manpage div#toc { display: none; }
}
+
+
</style>
<script type="text/javascript">
/*<+'])');
+ var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
// Function that scans the DOM tree for header elements (the DOM2
// nodeIterator API would be a better technique but not supported by all
// browsers).
@@ -610,7 +608,7 @@ toc: function (toclevels) { var i;
for (i = 0; i < toc.childNodes.length; i++) {
var entry = toc.childNodes[i];
- if (entry.nodeName == 'div'
+ if (entry.nodeName.toLowerCase() == 'div'
&& entry.getAttribute("class")
&& entry.getAttribute("class").match(/^toclevel/))
tocEntriesToRemove.push(entry);
@@ -656,7 +654,7 @@ footnotes: function () { var entriesToRemove = [];
for (i = 0; i < noteholder.childNodes.length; i++) {
var entry = noteholder.childNodes[i];
- if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote")
+ if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
entriesToRemove.push(entry);
}
for (i = 0; i < entriesToRemove.length; i++) {
@@ -774,7 +772,7 @@ page to learn what commands Git offers. You can learn more about individual Git commands with "git help command". <a href="gitcli.html">gitcli(7)</a>
manual page gives you an overview of the command-line command syntax.</p></div>
<div class="paragraph"><p>Formatted and hyperlinked version of the latest Git documentation
-can be viewed at <tt>http://git-htmldocs.googlecode.com/git/git.html</tt>.</p></div>
+can be viewed at <code>http://git-htmldocs.googlecode.com/git/git.html</code>.</p></div>
</div>
</div>
<div class="sect1">
@@ -801,8 +799,8 @@ can be viewed at <tt>http://git-htmldocs.googlecode.com/git/git.html</tt>.</p></ </p>
<div class="paragraph"><p>Other options are available to control how the manual page is
displayed. See <a href="git-help.html">git-help(1)</a> for more information,
-because <tt>git --help ...</tt> is converted internally into <tt>git
-help ...</tt>.</p></div>
+because <code>git --help ...</code> is converted internally into <code>git
+help ...</code>.</p></div>
</dd>
<dt class="hdlist1">
-C <path>
@@ -810,18 +808,18 @@ help ...</tt>.</p></div> <dd>
<p>
Run as if git was started in <em><path></em> instead of the current working
- directory. When multiple <tt>-C</tt> options are given, each subsequent
- non-absolute <tt>-C <path></tt> is interpreted relative to the preceding <tt>-C
- <path></tt>.
+ directory. When multiple <code>-C</code> options are given, each subsequent
+ non-absolute <code>-C <path></code> is interpreted relative to the preceding <code>-C
+ <path></code>.
</p>
-<div class="paragraph"><p>This option affects options that expect path name like <tt>--git-dir</tt> and
-<tt>--work-tree</tt> in that their interpretations of the path names would be
-made relative to the working directory caused by the <tt>-C</tt> option. For
+<div class="paragraph"><p>This option affects options that expect path name like <code>--git-dir</code> and
+<code>--work-tree</code> in that their interpretations of the path names would be
+made relative to the working directory caused by the <code>-C</code> option. For
example the following invocations are equivalent:</p></div>
<div class="literalblock">
<div class="content">
-<pre><tt>git --git-dir=a.git --work-tree=b -C c status
-git --git-dir=c/a.git --work-tree=c/b status</tt></pre>
+<pre><code>git --git-dir=a.git --work-tree=b -C c status
+git --git-dir=c/a.git --work-tree=c/b status</code></pre>
</div></div>
</dd>
<dt class="hdlist1">
@@ -834,10 +832,10 @@ git --git-dir=c/a.git --work-tree=c/b status</tt></pre> The <name> is expected in the same format as listed by
<em>git config</em> (subkeys separated by dots).
</p>
-<div class="paragraph"><p>Note that omitting the <tt>=</tt> in <tt>git -c foo.bar ...</tt> is allowed and sets
-<tt>foo.bar</tt> to the boolean true value (just like <tt>[foo]bar</tt> would in a
-config file). Including the equals but with an empty value (like <tt>git -c
-foo.bar= ...</tt>) sets <tt>foo.bar</tt> to the empty string.</p></div>
+<div class="paragraph"><p>Note that omitting the <code>=</code> in <code>git -c foo.bar ...</code> is allowed and sets
+<code>foo.bar</code> to the boolean true value (just like <code>[foo]bar</code> would in a
+config file). Including the equals but with an empty value (like <code>git -c
+foo.bar= ...</code>) sets <code>foo.bar</code> to the empty string.</p></div>
</dd>
<dt class="hdlist1">
--exec-path[=<path>]
@@ -864,7 +862,7 @@ foo.bar= ...</tt>) sets <tt>foo.bar</tt> to the empty string.</p></div> </dt>
<dd>
<p>
- Print the manpath (see <tt>man(1)</tt>) for the man pages for
+ Print the manpath (see <code>man(1)</code>) for the man pages for
this version of Git and exit.
</p>
</dd>
@@ -886,7 +884,7 @@ foo.bar= ...</tt>) sets <tt>foo.bar</tt> to the empty string.</p></div> <dd>
<p>
Pipe all output into <em>less</em> (or if set, $PAGER) if standard
- output is a terminal. This overrides the <tt>pager.<cmd></tt>
+ output is a terminal. This overrides the <code>pager.<cmd></code>
configuration options (see the "Configuration Mechanism" section
below).
</p>
@@ -928,7 +926,7 @@ foo.bar= ...</tt>) sets <tt>foo.bar</tt> to the empty string.</p></div> <dd>
<p>
Set the Git namespace. See <a href="gitnamespaces.html">gitnamespaces(7)</a> for more
- details. Equivalent to setting the <tt>GIT_NAMESPACE</tt> environment
+ details. Equivalent to setting the <code>GIT_NAMESPACE</code> environment
variable.
</p>
</dd>
@@ -957,8 +955,8 @@ foo.bar= ...</tt>) sets <tt>foo.bar</tt> to the empty string.</p></div> <dd>
<p>
Treat pathspecs literally (i.e. no globbing, no pathspec magic).
- This is equivalent to setting the <tt>GIT_LITERAL_PATHSPECS</tt> environment
- variable to <tt>1</tt>.
+ This is equivalent to setting the <code>GIT_LITERAL_PATHSPECS</code> environment
+ variable to <code>1</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -967,7 +965,7 @@ foo.bar= ...</tt>) sets <tt>foo.bar</tt> to the empty string.</p></div> <dd>
<p>
Add "glob" magic to all pathspec. This is equivalent to setting
- the <tt>GIT_GLOB_PATHSPECS</tt> environment variable to <tt>1</tt>. Disabling
+ the <code>GIT_GLOB_PATHSPECS</code> environment variable to <code>1</code>. Disabling
globbing on individual pathspecs can be done using pathspec
magic ":(literal)"
</p>
@@ -978,7 +976,7 @@ foo.bar= ...</tt>) sets <tt>foo.bar</tt> to the empty string.</p></div> <dd>
<p>
Add "literal" magic to all pathspec. This is equivalent to setting
- the <tt>GIT_NOGLOB_PATHSPECS</tt> environment variable to <tt>1</tt>. Enabling
+ the <code>GIT_NOGLOB_PATHSPECS</code> environment variable to <code>1</code>. Enabling
globbing on individual pathspecs can be done using pathspec
magic ":(glob)"
</p>
@@ -989,7 +987,7 @@ foo.bar= ...</tt>) sets <tt>foo.bar</tt> to the empty string.</p></div> <dd>
<p>
Add "icase" magic to all pathspec. This is equivalent to setting
- the <tt>GIT_ICASE_PATHSPECS</tt> environment variable to <tt>1</tt>.
+ the <code>GIT_ICASE_PATHSPECS</code> environment variable to <code>1</code>.
</p>
</dd>
</dl></div>
@@ -2191,7 +2189,7 @@ repository and are per user. Such a configuration file may look like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>#
+<pre><code>#
# A '#' or ';' character indicates a comment.
#
@@ -2203,7 +2201,7 @@ like this:</p></div> ; user identity
[user]
name = "Junio C Hamano"
- email = "gitster@pobox.com"</tt></pre>
+ email = "gitster@pobox.com"</code></pre>
</div></div>
<div class="paragraph"><p>Various commands read from the configuration file and adjust
their operation accordingly. See <a href="git-config.html">git-config(1)</a> for a
@@ -2274,7 +2272,7 @@ list and more details about the configuration mechanism.</p></div> <dd>
<p>
Indicates that an object type is required.
- Currently one of: <tt>blob</tt>, <tt>tree</tt>, <tt>commit</tt>, or <tt>tag</tt>.
+ Currently one of: <code>blob</code>, <code>tree</code>, <code>commit</code>, or <code>tag</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -2283,7 +2281,7 @@ list and more details about the configuration mechanism.</p></div> <dd>
<p>
Indicates a filename - almost always relative to the
- root of the tree structure <tt>GIT_INDEX_FILE</tt> describes.
+ root of the tree structure <code>GIT_INDEX_FILE</code> describes.
</p>
</dd>
</dl></div>
@@ -2309,7 +2307,7 @@ HEAD <dd>
<p>
a valid tag <em>name</em>
- (i.e. a <tt>refs/tags/<tag></tt> reference).
+ (i.e. a <code>refs/tags/<tag></code> reference).
</p>
</dd>
<dt class="hdlist1">
@@ -2318,7 +2316,7 @@ HEAD <dd>
<p>
a valid head <em>name</em>
- (i.e. a <tt>refs/heads/<head></tt> reference).
+ (i.e. a <code>refs/heads/<head></code> reference).
</p>
</dd>
</dl></div>
@@ -2332,7 +2330,7 @@ HEAD <div class="paragraph"><p>Please see the <a href="gitrepository-layout.html">gitrepository-layout(5)</a> document.</p></div>
<div class="paragraph"><p>Read <a href="githooks.html">githooks(5)</a> for more details about each hook.</p></div>
<div class="paragraph"><p>Higher level SCMs may provide and manage additional information in the
-<tt>$GIT_DIR</tt>.</p></div>
+<code>$GIT_DIR</code>.</p></div>
</div>
</div>
<div class="sect1">
@@ -2357,7 +2355,7 @@ Git so take care if using Cogito etc.</p></div> <dd>
<p>
This environment allows the specification of an alternate
- index file. If not specified, the default of <tt>$GIT_DIR/index</tt>
+ index file. If not specified, the default of <code>$GIT_DIR/index</code>
is used.
</p>
</dd>
@@ -2378,7 +2376,7 @@ Git so take care if using Cogito etc.</p></div> <p>
If the object storage directory is specified via this
environment variable then the sha1 directories are created
- underneath - otherwise the default <tt>$GIT_DIR/objects</tt>
+ underneath - otherwise the default <code>$GIT_DIR/objects</code>
directory is used.
</p>
</dd>
@@ -2400,7 +2398,7 @@ Git so take care if using Cogito etc.</p></div> <dd>
<p>
If the <em>GIT_DIR</em> environment variable is set then it
- specifies a path to use instead of the default <tt>.git</tt>
+ specifies a path to use instead of the default <code>.git</code>
for the base of the repository.
The <em>--git-dir</em> command-line option also sets this value.
</p>
@@ -2518,7 +2516,7 @@ Git so take care if using Cogito etc.</p></div> </p>
<div class="literalblock">
<div class="content">
-<pre><tt>path old-file old-hex old-mode new-file new-hex new-mode</tt></pre>
+<pre><code>path old-file old-hex old-mode new-file new-hex new-mode</code></pre>
</div></div>
<div class="paragraph"><p>where:</p></div>
</dd>
@@ -2547,8 +2545,8 @@ are the 40-hexdigit SHA-1 hashes, are the octal representation of the file modes.
</p>
<div class="paragraph"><p>The file parameters can point at the user’s working file
-(e.g. <tt>new-file</tt> in "git-diff-files"), <tt>/dev/null</tt> (e.g. <tt>old-file</tt>
-when a new file is added), or a temporary file (e.g. <tt>old-file</tt> in the
+(e.g. <code>new-file</code> in "git-diff-files"), <code>/dev/null</code> (e.g. <code>old-file</code>
+when a new file is added), or a temporary file (e.g. <code>old-file</code> in the
index). <em>GIT_EXTERNAL_DIFF</em> should not worry about unlinking the
temporary file --- it is removed when <em>GIT_EXTERNAL_DIFF</em> exits.</p></div>
<div class="paragraph"><p>For a path that is unmerged, <em>GIT_EXTERNAL_DIFF</em> is called with 1
@@ -2592,9 +2590,9 @@ parameter, <path>.</p></div> </dt>
<dd>
<p>
- This environment variable overrides <tt>$PAGER</tt>. If it is set
+ This environment variable overrides <code>$PAGER</code>. If it is set
to an empty string or to the value "cat", Git will not launch
- a pager. See also the <tt>core.pager</tt> option in
+ a pager. See also the <code>core.pager</code> option in
<a href="git-config.html">git-config(1)</a>.
</p>
</dd>
@@ -2603,10 +2601,10 @@ parameter, <path>.</p></div> </dt>
<dd>
<p>
- This environment variable overrides <tt>$EDITOR</tt> and <tt>$VISUAL</tt>.
+ This environment variable overrides <code>$EDITOR</code> and <code>$VISUAL</code>.
It is used by several Git commands when, on interactive mode,
an editor is to be launched. See also <a href="git-var.html">git-var(1)</a>
- and the <tt>core.editor</tt> option in <a href="git-config.html">git-config(1)</a>.
+ and the <code>core.editor</code> option in <a href="git-config.html">git-config(1)</a>.
</p>
</dd>
<dt class="hdlist1">
@@ -2628,7 +2626,7 @@ parameter, <path>.</p></div> you will need to wrap the program and options into a shell script,
then set GIT_SSH to refer to the shell script.</p></div>
<div class="paragraph"><p>Usually it is easier to configure any desired options through your
-personal <tt>.ssh/config</tt> file. Please consult your ssh documentation
+personal <code>.ssh/config</code> file. Please consult your ssh documentation
for further details.</p></div>
</dd>
<dt class="hdlist1">
@@ -2649,10 +2647,10 @@ for further details.</p></div> <dd>
<p>
Whether to skip reading settings from the system-wide
- <tt>$(prefix)/etc/gitconfig</tt> file. This environment variable can
- be used along with <tt>$HOME</tt> and <tt>$XDG_CONFIG_HOME</tt> to create a
+ <code>$(prefix)/etc/gitconfig</code> file. This environment variable can
+ be used along with <code>$HOME</code> and <code>$XDG_CONFIG_HOME</code> to create a
predictable environment for a picky script, or you can set it
- temporarily to avoid using a buggy <tt>/etc/gitconfig</tt> file while
+ temporarily to avoid using a buggy <code>/etc/gitconfig</code> file while
waiting for someone with sufficient permissions to fix it.
</p>
</dd>
@@ -2753,13 +2751,13 @@ GIT_LITERAL_PATHSPECS </dt>
<dd>
<p>
- Setting this variable to <tt>1</tt> will cause Git to treat all
+ Setting this variable to <code>1</code> will cause Git to treat all
pathspecs literally, rather than as glob patterns. For example,
- running <tt>GIT_LITERAL_PATHSPECS=1 git log -- '*.c'</tt> will search
- for commits that touch the path <tt>*.c</tt>, not any paths that the
- glob <tt>*.c</tt> matches. You might want this if you are feeding
+ running <code>GIT_LITERAL_PATHSPECS=1 git log -- '*.c'</code> will search
+ for commits that touch the path <code>*.c</code>, not any paths that the
+ glob <code>*.c</code> matches. You might want this if you are feeding
literal paths to Git (e.g., paths previously given to you by
- <tt>git ls-tree</tt>, <tt>--raw</tt> diff output, etc).
+ <code>git ls-tree</code>, <code>--raw</code> diff output, etc).
</p>
</dd>
<dt class="hdlist1">
@@ -2767,7 +2765,7 @@ GIT_GLOB_PATHSPECS </dt>
<dd>
<p>
- Setting this variable to <tt>1</tt> will cause Git to treat all
+ Setting this variable to <code>1</code> will cause Git to treat all
pathspecs as glob patterns (aka "glob" magic).
</p>
</dd>
@@ -2776,7 +2774,7 @@ GIT_NOGLOB_PATHSPECS </dt>
<dd>
<p>
- Setting this variable to <tt>1</tt> will cause Git to treat all
+ Setting this variable to <code>1</code> will cause Git to treat all
pathspecs as literal (aka "literal" magic).
</p>
</dd>
@@ -2785,7 +2783,7 @@ GIT_ICASE_PATHSPECS </dt>
<dd>
<p>
- Setting this variable to <tt>1</tt> will cause Git to treat all
+ Setting this variable to <code>1</code> will cause Git to treat all
pathspecs as case-insensitive.
</p>
</dd>
@@ -2799,7 +2797,7 @@ GIT_ICASE_PATHSPECS typically the name of the high-level command that updated
the ref), in addition to the old and new values of the ref.
A scripted Porcelain command can use set_reflog_action
- helper function in <tt>git-sh-setup</tt> to set its name to this
+ helper function in <code>git-sh-setup</code> to set its name to this
variable when it is invoked as the top level command by the
end user, to be recorded in the body of the reflog.
</p>
@@ -2837,10 +2835,10 @@ purpose.</p></div> efficiency may later be compressed together into "pack files".</p></div>
<div class="paragraph"><p>Named pointers called refs mark interesting points in history. A ref
may contain the SHA-1 name of an object or the name of another ref. Refs
-with names beginning <tt>ref/head/</tt> contain the SHA-1 name of the most
+with names beginning <code>ref/head/</code> contain the SHA-1 name of the most
recent commit (or "head") of a branch under development. SHA-1 names of
-tags of interest are stored under <tt>ref/tags/</tt>. A special ref named
-<tt>HEAD</tt> contains the name of the currently checked-out branch.</p></div>
+tags of interest are stored under <code>ref/tags/</code>. A special ref named
+<code>HEAD</code> contains the name of the currently checked-out branch.</p></div>
<div class="paragraph"><p>The index file is initialized with a list of all paths and, for each
path, a blob object and a set of attributes. The blob object represents
the contents of the file as of the head of the current branch. The
@@ -2912,7 +2910,7 @@ subscribed to the list to send a message there.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-09-09 14:15:21 PDT
+Last updated 2014-09-19 15:32:09 PDT
</div>
</div>
</body>
|