diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
| commit | ba4b9286c25f18c7ebbb809ee5732a7810377ab6 (patch) | |
| tree | 390507328a7564b65dc803683c34235700b97409 /git-archimport.html | |
| parent | 05bf9c54a827e48b2b576488f5170a3490b5180e (diff) | |
| download | git-htmldocs-ba4b9286c25f18c7ebbb809ee5732a7810377ab6.tar.gz | |
Autogenerated HTML docs for v1.5.6.2-212-g08b5
Diffstat (limited to 'git-archimport.html')
| -rw-r--r-- | git-archimport.html | 134 |
1 files changed, 91 insertions, 43 deletions
diff --git a/git-archimport.html b/git-archimport.html index d2f8c36b0..67315b90c 100644 --- a/git-archimport.html +++ b/git-archimport.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>git-archimport(1)</title>
</head>
@@ -276,53 +324,53 @@ git-archimport(1) Manual Page <div class="content"><em>git archimport</em> [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
<archive/branch>[:<git-branch>] …</div></div>
</div>
-<h2>DESCRIPTION</h2>
+<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<p>Imports a project from one or more Arch repositories. It will follow branches
+<div class="para"><p>Imports a project from one or more Arch repositories. It will follow branches
and repositories within the namespaces defined by the <archive/branch>
parameters supplied. If it cannot find the remote branch a merge comes from
it will just import it as a regular commit. If it can find it, it will mark it
-as a merge whenever possible (see discussion below).</p>
-<p>The script expects you to provide the key roots where it can start the import
+as a merge whenever possible (see discussion below).</p></div>
+<div class="para"><p>The script expects you to provide the key roots where it can start the import
from an <em>initial import</em> or <em>tag</em> type of Arch commit. It will follow and
-import new branches within the provided roots.</p>
-<p>It expects to be dealing with one project only. If it sees
+import new branches within the provided roots.</p></div>
+<div class="para"><p>It expects to be dealing with one project only. If it sees
branches that have different roots, it will refuse to run. In that case,
edit your <archive/branch> parameters to define clearly the scope of the
-import.</p>
-<p><tt>git-archimport</tt> uses <tt>tla</tt> extensively in the background to access the
+import.</p></div>
+<div class="para"><p><em>git-archimport</em> uses <tt>tla</tt> extensively in the background to access the
Arch repository.
Make sure you have a recent version of <tt>tla</tt> available in the path. <tt>tla</tt> must
-know about the repositories you pass to <tt>git-archimport</tt>.</p>
-<p>For the initial import, <tt>git-archimport</tt> expects to find itself in an empty
+know about the repositories you pass to <em>git-archimport</em>.</p></div>
+<div class="para"><p>For the initial import, <em>git-archimport</em> expects to find itself in an empty
directory. To follow the development of a project that uses Arch, rerun
-<tt>git-archimport</tt> with the same parameters as the initial import to perform
-incremental imports.</p>
-<p>While <tt>git-archimport</tt> will try to create sensible branch names for the
+<em>git-archimport</em> with the same parameters as the initial import to perform
+incremental imports.</p></div>
+<div class="para"><p>While <em>git-archimport</em> will try to create sensible branch names for the
archives that it imports, it is also possible to specify git branch names
manually. To do so, write a git branch name after each <archive/branch>
parameter, separated by a colon. This way, you can shorten the Arch
branch names and convert Arch jargon to git jargon, for example mapping a
-"PROJECT--devo--VERSION" branch to "master".</p>
-<p>Associating multiple Arch branches to one git branch is possible; the
+"PROJECT--devo--VERSION" branch to "master".</p></div>
+<div class="para"><p>Associating multiple Arch branches to one git branch is possible; the
result will make the most sense only if no commits are made to the first
branch, after the second branch is created. Still, this is useful to
-convert Arch repositories that had been rotated periodically.</p>
+convert Arch repositories that had been rotated periodically.</p></div>
</div>
-<h2>MERGES</h2>
+<h2 id="_merges">MERGES</h2>
<div class="sectionbody">
-<p>Patch merge data from Arch is used to mark merges in git as well. git
+<div class="para"><p>Patch merge data from Arch is used to mark merges in git as well. git
does not care much about tracking patches, and only considers a merge when a
branch incorporates all the commits since the point they forked. The end result
is that git will have a good idea of how far branches have diverged. So the
-import process does lose some patch-trading metadata.</p>
-<p>Fortunately, when you try and merge branches imported from Arch,
+import process does lose some patch-trading metadata.</p></div>
+<div class="para"><p>Fortunately, when you try and merge branches imported from Arch,
git will find a good merge base, and it has a good chance of identifying
-patches that have been traded out-of-sequence between the branches.</p>
+patches that have been traded out-of-sequence between the branches.</p></div>
</div>
-<h2>OPTIONS</h2>
+<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
-h
</dt>
@@ -364,7 +412,7 @@ patches that have been traded out-of-sequence between the branches.</p> <dd>
<p>
Use this for compatibility with old-style branch names used by
- earlier versions of <tt>git-archimport</tt>. Old-style branch names
+ earlier versions of <em>git-archimport</em>. Old-style branch names
were category--branch, whereas new-style branch names are
archive,category--branch--version. In both cases, names given
on the command-line will override the automatically-generated
@@ -406,23 +454,23 @@ patches that have been traded out-of-sequence between the branches.</p> Archive/branch identifier in a format that <tt>tla log</tt> understands.
</p>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>Author</h2>
+<h2 id="_author">Author</h2>
<div class="sectionbody">
-<p>Written by Martin Langhoff <martin@catalyst.net.nz>.</p>
+<div class="para"><p>Written by Martin Langhoff <martin@catalyst.net.nz>.</p></div>
</div>
-<h2>Documentation</h2>
+<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
-<p>Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kernel.org>.</p>
+<div class="para"><p>Documentation by Junio C Hamano, Martin Langhoff and the git-list <git@vger.kernel.org>.</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:01:32 UTC
+Last updated 2008-07-06 05:16:35 UTC
</div>
</div>
</body>
|