diff options
author | Junio C Hamano <junio@kernel.org> | 2010-09-03 21:33:06 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2010-09-03 21:33:06 +0000 |
commit | 2db3e750d172a78dadfb29235ad2a2c3c8d45a24 (patch) | |
tree | 1f66627398f37b23ec3af2697514d33d25060d96 /git-archimport.txt | |
parent | d7ae629d13f3242b66070b20f4bb83486948150a (diff) | |
download | git-htmldocs-2db3e750d172a78dadfb29235ad2a2c3c8d45a24.tar.gz |
Autogenerated HTML docs for v1.7.2.3-313-gcd15
Diffstat (limited to 'git-archimport.txt')
-rw-r--r-- | git-archimport.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-archimport.txt b/git-archimport.txt index 4d4325f22..4f358c8d6 100644 --- a/git-archimport.txt +++ b/git-archimport.txt @@ -44,7 +44,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 <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". +"PROJECT{litdd}devo{litdd}VERSION" branch to "master". 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 @@ -85,8 +85,8 @@ OPTIONS -o:: 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. In both cases, names given + were category{litdd}branch, whereas new-style branch names are + archive,category{litdd}branch{litdd}version. In both cases, names given on the command-line will override the automatically-generated ones. |