diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:53:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:53:38 -0800 |
| commit | 59a32b07d3e226cad19135aee37bf81c8849efc8 (patch) | |
| tree | 36b60b52ab5a116eed5ea4723dfa5559da7981a2 /git-archimport.txt | |
| parent | f24d6b5b23d901f1da0026ce4b3f9c1e1b5e09f6 (diff) | |
| download | git-htmldocs-59a32b07d3e226cad19135aee37bf81c8849efc8.tar.gz | |
Autogenerated HTML docs for v2.34.1-182-ge7735
Diffstat (limited to 'git-archimport.txt')
| -rw-r--r-- | git-archimport.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/git-archimport.txt b/git-archimport.txt index a595a0ffe..847777fd1 100644 --- a/git-archimport.txt +++ b/git-archimport.txt @@ -9,14 +9,14 @@ git-archimport - Import a GNU Arch repository into Git SYNOPSIS -------- [verse] -'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir] - <archive/branch>[:<git-branch>] ... +'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D <depth>] [-t <tempdir>] + <archive>/<branch>[:<git-branch>]... DESCRIPTION ----------- Imports a project from one or more GNU Arch repositories. It will follow branches -and repositories within the namespaces defined by the <archive/branch> +and repositories within the namespaces defined by the <archive>/<branch> parameters supplied. If it cannot find the remote branch a merge comes from it will just import it as a regular commit. If it can find it, it will mark it as a merge whenever possible (see discussion below). @@ -27,7 +27,7 @@ import new branches within the provided roots. It expects to be dealing with one project only. If it sees 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 +edit your <archive>/<branch> parameters to define clearly the scope of the import. 'git archimport' uses `tla` extensively in the background to access the @@ -42,7 +42,7 @@ incremental imports. 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> +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{litdd}devo{litdd}VERSION" branch to "master". @@ -104,8 +104,8 @@ OPTIONS Override the default tempdir. -<archive/branch>:: - Archive/branch identifier in a format that `tla log` understands. +<archive>/<branch>:: + <archive>/<branch> identifier in a format that `tla log` understands. GIT |