Autogenerated HTML docs for v1.5.0.3-310-g05ef5

1 files changed, 15 insertions, 3 deletions

diff --git a/git-archimport.html b/git-archimport.html
index 887acd215..9ecbb6349 100644
--- a/git-archimport.html
+++ b/git-archimport.html
@@ -274,7 +274,7 @@ git-archimport(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <div class="content"><em>git-archimport</em> [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]

-               &lt;archive/branch&gt; [ &lt;archive/branch&gt; ]</div></div>

+               &lt;archive/branch&gt;[:&lt;git-branch&gt;] &#8230;</div></div>

 </div>

 <h2>DESCRIPTION</h2>

 <div class="sectionbody">

@@ -298,6 +298,16 @@ know about the repositories you pass to <tt>git-archimport</tt>.</p>
 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 git-archimport 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

+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

+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>

 </div>

 <h2>MERGES</h2>

 <div class="sectionbody">

@@ -356,7 +366,9 @@ patches that have been traded out-of-sequence between the branches.</p>
         Use this for compatibility with old-style branch names used by

         earlier versions of git-archimport.  Old-style branch names

         were category--branch, whereas new-style branch names are

-        archive,category--branch--version.

+        archive,category--branch--version.  In both cases, names given

+        on the command-line will override the automatically-generated

+        ones.

 </p>

 </dd>

 <dt>

@@ -410,7 +422,7 @@ patches that have been traded out-of-sequence between the branches.</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 03-Oct-2006 08:40:52 UTC

+Last updated 08-Mar-2007 02:42:38 UTC

 </div>

 </div>

 </body>