X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-archimport.txt;h=f089debaa9bd25e002b64f8dabc7459dfcc4d787;hb=7a7d4ef69c2c79b10977508794e1bbd62ca9ed2b;hp=7091b8d61cf4871e2cecc7b18bc6997ea42b4ef9;hpb=d9f405931fa3d96b2a80fe5ad8205eea7c443f56;p=git.git diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt index 7091b8d61..f089debaa 100644 --- a/Documentation/git-archimport.txt +++ b/Documentation/git-archimport.txt @@ -9,7 +9,7 @@ git-archimport - Import an Arch repository into git SYNOPSIS -------- [verse] -'git-archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir] +'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir] [:] ... DESCRIPTION @@ -34,12 +34,12 @@ 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`. -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 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 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 @@ -117,4 +117,4 @@ Documentation by Junio C Hamano, Martin Langhoff and the git-list