summaryrefslogtreecommitdiffstats
path: root/git-archimport.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-01-21 17:46:43 +0000
committerJunio C Hamano <junio@kernel.org>2010-01-21 17:46:43 +0000
commit1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch)
tree72812d480799e16b94f9cfed423b8d7d45c7fb4f /git-archimport.html
parenta9701f0184382d8de7380c56558718915905746a (diff)
downloadgit-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'git-archimport.html')
-rw-r--r--git-archimport.html14
1 files changed, 7 insertions, 7 deletions
diff --git a/git-archimport.html b/git-archimport.html
index b672185b9..379ed9f88 100644
--- a/git-archimport.html
+++ b/git-archimport.html
@@ -338,15 +338,15 @@ import new branches within the provided roots.</p></div>
branches that have different roots, it will refuse to run. In that case,
edit your &lt;archive/branch&gt; parameters to define clearly the scope of the
import.</p></div>
-<div class="para"><p><em>git-archimport</em> uses <tt>tla</tt> extensively in the background to access the
+<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 <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
+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
-<em>git-archimport</em> with the same parameters as the initial import to perform
+<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
+<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 &lt;archive/branch&gt;
parameter, separated by a colon. This way, you can shorten the Arch
@@ -412,7 +412,7 @@ patches that have been traded out-of-sequence between the branches.</p></div>
<dd>
<p>
Use this for compatibility with old-style branch names used by
- earlier versions of <em>git-archimport</em>. 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
@@ -470,7 +470,7 @@ patches that have been traded out-of-sequence between the branches.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-12-03 09:12:26 UTC
+Last updated 2010-01-21 17:44:21 UTC
</div>
</div>
</body>