diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-11-06 01:01:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-11-06 01:01:59 +0000 |
| commit | 68cf15a825368c926443c26a6516947fca3c1d39 (patch) | |
| tree | a587c9a51372746ddc3cdb08108bb14fb94a0488 /git-bundle.html | |
| parent | 39c7a69d994a13cbd5594bf2f5e65a0f21cc9bb9 (diff) | |
| download | git-htmldocs-68cf15a825368c926443c26a6516947fca3c1d39.tar.gz | |
Autogenerated HTML docs for v1.7.3.2-161-g3089c
Diffstat (limited to 'git-bundle.html')
| -rw-r--r-- | git-bundle.html | 214 |
1 files changed, 155 insertions, 59 deletions
diff --git a/git-bundle.html b/git-bundle.html index 76bbe8755..df35ffec2 100644 --- a/git-bundle.html +++ b/git-bundle.html @@ -3,7 +3,8 @@ <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 8.2.5" />
+<meta name="generator" content="AsciiDoc 8.4.5" />
+<title>git-bundle(1)</title>
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -26,10 +27,12 @@ a:visited { em {
font-style: italic;
+ color: navy;
}
strong {
font-weight: bold;
+ color: #083194;
}
tt {
@@ -71,6 +74,10 @@ p { margin-bottom: 0.5em;
}
+ul, ol, li > p {
+ margin-top: 0;
+}
+
pre {
padding: 0;
margin: 0;
@@ -84,7 +91,7 @@ span#author { }
span#email {
}
-span#revision {
+span#revnumber, span#revdate, span#revremark {
font-family: sans-serif;
}
@@ -104,11 +111,13 @@ div#footer-badges { padding-bottom: 0.5em;
}
-div#preamble,
+div#preamble {
+ margin-top: 1.5em;
+ margin-bottom: 1.5em;
+}
div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
- margin-right: 10%;
margin-top: 1.5em;
margin-bottom: 1.5em;
}
@@ -123,6 +132,7 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
text-align: left;
@@ -149,22 +159,33 @@ div.sidebarblock > div.content { padding: 0.5em;
}
-div.listingblock {
- margin-right: 0%;
-}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
}
-div.quoteblock > div.content {
+div.quoteblock {
padding-left: 2.0em;
+ margin-right: 10%;
}
-
-div.attribution {
+div.quoteblock > div.attribution {
+ padding-top: 0.5em;
text-align: right;
}
+
+div.verseblock {
+ padding-left: 2.0em;
+ margin-right: 10%;
+}
+div.verseblock > div.content {
+ white-space: pre;
+}
+div.verseblock > div.attribution {
+ padding-top: 0.75em;
+ text-align: left;
+}
+/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
text-align: left;
}
@@ -187,13 +208,9 @@ div.exampleblock > div.content { padding: 0.5em;
}
-div.verseblock div.content {
- white-space: pre;
-}
-
div.imageblock div.content { padding-left: 0; }
-div.imageblock img { border: 1px solid silver; }
span.image img { border-style: none; }
+a.image:visited { color: white; }
dl {
margin-top: 0.8em;
@@ -202,18 +219,38 @@ dl { dt {
margin-top: 0.5em;
margin-bottom: 0;
- font-style: italic;
+ font-style: normal;
+ color: navy;
}
dd > *:first-child {
- margin-top: 0;
+ margin-top: 0.1em;
}
ul, ol {
list-style-position: outside;
}
-div.olist2 ol {
+ol.arabic {
+ list-style-type: decimal;
+}
+ol.loweralpha {
list-style-type: lower-alpha;
}
+ol.upperalpha {
+ list-style-type: upper-alpha;
+}
+ol.lowerroman {
+ list-style-type: lower-roman;
+}
+ol.upperroman {
+ list-style-type: upper-roman;
+}
+
+div.compact ul, div.compact ol,
+div.compact p, div.compact p,
+div.compact div, div.compact div {
+ margin-top: 0.1em;
+ margin-bottom: 0.1em;
+}
div.tableblock > table {
border: 3px solid #527bbd;
@@ -225,22 +262,53 @@ thead { tfoot {
font-weight: bold;
}
+td > div.verse {
+ white-space: pre;
+}
+p.table {
+ margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
+ border-style: none;
+}
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
+}
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
+}
+
-div.hlist {
+div.hdlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
-div.hlist td {
- padding-bottom: 5px;
+div.hdlist tr {
+ padding-bottom: 15px;
}
-td.hlist1 {
+dt.hdlist1.strong, td.hdlist1.strong {
+ font-weight: bold;
+}
+td.hdlist1 {
vertical-align: top;
- font-style: italic;
+ font-style: normal;
padding-right: 0.8em;
+ color: navy;
}
-td.hlist2 {
+td.hdlist2 {
vertical-align: top;
}
+div.hdlist.compact tr {
+ margin: 0;
+ padding-bottom: 0;
+}
+
+.comment {
+ background: yellow;
+}
@media print {
div#footer-badges { display: none; }
@@ -271,7 +339,24 @@ div.toclevel4 { margin-left: 6em;
font-size: 0.9em;
}
-include1::./stylesheets/xhtml11-manpage.css[]
+/* Overrides for manpage documents */
+h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+h2 {
+ border-style: none;
+}
+div.sectionbody {
+ margin-left: 5%;
+}
+
+@media print {
+ div#toc { display: none; }
+}
+
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -280,6 +365,7 @@ div.sidebar-content { padding: 0.5em;
}
div.sidebar-title, div.image-title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
margin-top: 0.0em;
@@ -292,8 +378,17 @@ div.listingblock div.content { padding: 0.5em;
}
-div.quoteblock-content {
- padding-left: 2.0em;
+div.quoteblock-attribution {
+ padding-top: 0.5em;
+ text-align: right;
+}
+
+div.verseblock-content {
+ white-space: pre;
+}
+div.verseblock-attribution {
+ padding-top: 0.75em;
+ text-align: left;
}
div.exampleblock-content {
@@ -304,7 +399,6 @@ div.exampleblock-content { /* IE6 sets dynamically generated links as visited. */
div#toc a:visited { color: blue; }
</style>
-<title>git-bundle(1)</title>
</head>
<body>
<div id="header">
@@ -318,17 +412,19 @@ git-bundle(1) Manual Page </p>
</div>
</div>
-<h2>SYNOPSIS</h2>
+<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git bundle</em> create <file> <git-rev-list-args>
+<div class="verseblock-content"><em>git bundle</em> create <file> <git-rev-list-args>
<em>git bundle</em> verify <file>
<em>git bundle</em> list-heads <file> [<refname>…]
-<em>git bundle</em> unbundle <file> [<refname>…]</div></div>
+<em>git bundle</em> unbundle <file> [<refname>…]</div>
+<div class="verseblock-attribution">
+</div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>Some workflows require that one or more branches of development on one
+<div class="paragraph"><p>Some workflows require that one or more branches of development on one
machine be replicated on another machine, but the two machines cannot
be directly connected, and therefore the interactive git protocols (git,
ssh, rsync, http) cannot be used. This command provides support for
@@ -343,8 +439,8 @@ destination repository.</p></div> </div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
create <file>
</dt>
<dd>
@@ -353,7 +449,7 @@ create <file> <em>git-rev-list-args</em> arguments to define the bundle contents.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
verify <file>
</dt>
<dd>
@@ -366,7 +462,7 @@ verify <file> with a non-zero status.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
list-heads <file>
</dt>
<dd>
@@ -376,7 +472,7 @@ list-heads <file> printed out.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
unbundle <file>
</dt>
<dd>
@@ -388,7 +484,7 @@ unbundle <file> really plumbing, intended to be called only by <em>git fetch</em>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
<git-rev-list-args>
</dt>
<dd>
@@ -403,7 +499,7 @@ unbundle <file> packaged.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
[<refname>…]
</dt>
<dd>
@@ -419,7 +515,7 @@ unbundle <file> </div>
<h2 id="_specifying_references">SPECIFYING REFERENCES</h2>
<div class="sectionbody">
-<div class="para"><p><em>git bundle</em> will only package references that are shown by
+<div class="paragraph"><p><em>git bundle</em> will only package references that are shown by
<em>git show-ref</em>: this includes heads, tags, and remote heads. References
such as <tt>master~1</tt> cannot be packaged, but are perfectly suitable for
defining the basis. More than one reference may be packaged, and more
@@ -427,19 +523,19 @@ than one basis can be specified. The objects packaged are those not contained in the union of the given bases. Each basis can be
specified explicitly (e.g. <tt>^master~10</tt>), or implicitly (e.g.
<tt>master~10..master</tt>, <tt>--since=10.days.ago master</tt>).</p></div>
-<div class="para"><p>It is very important that the basis used be held by the destination.
+<div class="paragraph"><p>It is very important that the basis used be held by the destination.
It is okay to err on the side of caution, causing the bundle file
to contain objects already in the destination, as these are ignored
when unpacking at the destination.</p></div>
</div>
<h2 id="_example">EXAMPLE</h2>
<div class="sectionbody">
-<div class="para"><p>Assume you want to transfer the history from a repository R1 on machine A
+<div class="paragraph"><p>Assume you want to transfer the history from a repository R1 on machine A
to another repository R2 on machine B.
For whatever reason, direct connection between A and B is not allowed,
but we can move data from A to B via some mechanism (CD, email, etc.).
We want to update R2 with development made on the branch master in R1.</p></div>
-<div class="para"><p>To bootstrap the process, you can first create a bundle that does not have
+<div class="paragraph"><p>To bootstrap the process, you can first create a bundle that does not have
any basis. You can use a tag to remember up to what commit you last
processed, in order to make it easy to later update the other repository
with an incremental bundle:</p></div>
@@ -449,7 +545,7 @@ with an incremental bundle:</p></div> machineA$ git bundle create file.bundle master
machineA$ git tag -f lastR2bundle master</tt></pre>
</div></div>
-<div class="para"><p>Then you transfer file.bundle to the target machine B. If you are creating
+<div class="paragraph"><p>Then you transfer file.bundle to the target machine B. If you are creating
the repository on machine B, then you can clone from the bundle as if it
were a remote repository instead of creating an empty repository and then
pulling or fetching objects from the bundle:</p></div>
@@ -457,7 +553,7 @@ pulling or fetching objects from the bundle:</p></div> <div class="content">
<pre><tt>machineB$ git clone /home/me/tmp/file.bundle R2</tt></pre>
</div></div>
-<div class="para"><p>This will define a remote called "origin" in the resulting repository that
+<div class="paragraph"><p>This will define a remote called "origin" in the resulting repository that
lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 will
have an entry like this:</p></div>
<div class="listingblock">
@@ -466,10 +562,10 @@ have an entry like this:</p></div> url = /home/me/tmp/file.bundle
fetch = refs/heads/*:refs/remotes/origin/*</tt></pre>
</div></div>
-<div class="para"><p>To update the resulting mine.git repository, you can fetch or pull after
+<div class="paragraph"><p>To update the resulting mine.git repository, you can fetch or pull after
replacing the bundle stored at /home/me/tmp/file.bundle with incremental
updates.</p></div>
-<div class="para"><p>After working some more in the original repository, you can create an
+<div class="paragraph"><p>After working some more in the original repository, you can create an
incremental bundle to update the other repository:</p></div>
<div class="listingblock">
<div class="content">
@@ -477,50 +573,50 @@ incremental bundle to update the other repository:</p></div> machineA$ git bundle create file.bundle lastR2bundle..master
machineA$ git tag -f lastR2bundle master</tt></pre>
</div></div>
-<div class="para"><p>You then transfer the bundle to the other machine to replace
+<div class="paragraph"><p>You then transfer the bundle to the other machine to replace
/home/me/tmp/file.bundle, and pull from it.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>machineB$ cd R2
machineB$ git pull</tt></pre>
</div></div>
-<div class="para"><p>If you know up to what commit the intended recipient repository should
+<div class="paragraph"><p>If you know up to what commit the intended recipient repository should
have the necessary objects, you can use that knowledge to specify the
basis, giving a cut-off point to limit the revisions and objects that go
in the resulting bundle. The previous example used the lastR2bundle tag
for this purpose, but you can use any other options that you would give to
the <a href="git-log.html">git-log(1)</a> command. Here are more examples:</p></div>
-<div class="para"><p>You can use a tag that is present in both:</p></div>
+<div class="paragraph"><p>You can use a tag that is present in both:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git bundle create mybundle v1.0.0..master</tt></pre>
</div></div>
-<div class="para"><p>You can use a basis based on time:</p></div>
+<div class="paragraph"><p>You can use a basis based on time:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git bundle create mybundle --since=10.days master</tt></pre>
</div></div>
-<div class="para"><p>You can use the number of commits:</p></div>
+<div class="paragraph"><p>You can use the number of commits:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git bundle create mybundle -10 master</tt></pre>
</div></div>
-<div class="para"><p>You can run <tt>git-bundle verify</tt> to see if you can extract from a bundle
+<div class="paragraph"><p>You can run <tt>git-bundle verify</tt> to see if you can extract from a bundle
that was created with a basis:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git bundle verify mybundle</tt></pre>
</div></div>
-<div class="para"><p>This will list what commits you must have in order to extract from the
+<div class="paragraph"><p>This will list what commits you must have in order to extract from the
bundle and will error out if you do not have them.</p></div>
-<div class="para"><p>A bundle from a recipient repository's point of view is just like a
+<div class="paragraph"><p>A bundle from a recipient repository’s point of view is just like a
regular repository which it fetches or pulls from. You can, for example, map
references when fetching:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git fetch mybundle master:localRef</tt></pre>
</div></div>
-<div class="para"><p>You can also see what references it offers:</p></div>
+<div class="paragraph"><p>You can also see what references it offers:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git ls-remote mybundle</tt></pre>
@@ -528,15 +624,15 @@ references when fetching:</p></div> </div>
<h2 id="_author">Author</h2>
<div class="sectionbody">
-<div class="para"><p>Written by Mark Levedahl <mdl123@verizon.net></p></div>
+<div class="paragraph"><p>Written by Mark Levedahl <<a href="mailto:mdl123@verizon.net">mdl123@verizon.net</a>></p></div>
</div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
+<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-10-22 04:11:02 UTC
+Last updated 2010-11-06 00:41:57 UTC
</div>
</div>
</body>
|