diff options
author | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
commit | 1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch) | |
tree | 72812d480799e16b94f9cfed423b8d7d45c7fb4f /git-archimport.txt | |
parent | a9701f0184382d8de7380c56558718915905746a (diff) | |
download | git-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz |
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'git-archimport.txt')
-rw-r--r-- | git-archimport.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-archimport.txt b/git-archimport.txt index c7a6e3ec0..4d4325f22 100644 --- a/git-archimport.txt +++ b/git-archimport.txt @@ -29,17 +29,17 @@ 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. -'git-archimport' uses `tla` extensively in the background to access the +'git archimport' uses `tla` extensively in the background to access the Arch repository. Make sure you have a recent version of `tla` available in the path. `tla` must -know about the repositories you pass to 'git-archimport'. +know about the repositories you pass to 'git archimport'. -For the initial import, 'git-archimport' expects to find itself in an empty +For the initial import, 'git archimport' expects to find itself in an empty directory. To follow the development of a project that uses Arch, rerun -'git-archimport' with the same parameters as the initial import to perform +'git archimport' with the same parameters as the initial import to perform incremental imports. -While 'git-archimport' will try to create sensible branch names for the +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 <archive/branch> parameter, separated by a colon. This way, you can shorten the Arch @@ -84,7 +84,7 @@ OPTIONS -o:: Use this for compatibility with old-style branch names used by - earlier versions of 'git-archimport'. Old-style branch names + 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 on the command-line will override the automatically-generated |