summaryrefslogtreecommitdiffstats
path: root/git-archimport.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-09-03 21:33:06 +0000
committerJunio C Hamano <junio@kernel.org>2010-09-03 21:33:06 +0000
commit2db3e750d172a78dadfb29235ad2a2c3c8d45a24 (patch)
tree1f66627398f37b23ec3af2697514d33d25060d96 /git-archimport.html
parentd7ae629d13f3242b66070b20f4bb83486948150a (diff)
downloadgit-htmldocs-2db3e750d172a78dadfb29235ad2a2c3c8d45a24.tar.gz
Autogenerated HTML docs for v1.7.2.3-313-gcd15
Diffstat (limited to 'git-archimport.html')
-rw-r--r--git-archimport.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-archimport.html b/git-archimport.html
index 6ab8e0bdd..11e92bb51 100644
--- a/git-archimport.html
+++ b/git-archimport.html
@@ -351,7 +351,7 @@ 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></div>
+"PROJECT&#45;&#45;devo&#45;&#45;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
@@ -413,8 +413,8 @@ patches that have been traded out-of-sequence between the branches.</p></div>
<p>
Use this for compatibility with old-style branch names used by
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
+ were category&#45;&#45;branch, whereas new-style branch names are
+ archive,category&#45;&#45;branch&#45;&#45;version. In both cases, names given
on the command-line will override the automatically-generated
ones.
</p>
@@ -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 2010-07-21 21:55:15 UTC
+Last updated 2010-09-03 21:30:00 UTC
</div>
</div>
</body>