diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-01-06 17:13:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-01-06 17:13:58 -0800 |
| commit | 235a91e6b0d1d18a2517cf7e0a18278a6912bdb0 (patch) | |
| tree | 526cd006cb2571a64bb543fbe7fbdd8e425af718 /git-archimport.txt | |
| parent | ab0087622a692f2980ae9f169beb4459f36bf230 (diff) | |
| download | git-htmldocs-235a91e6b0d1d18a2517cf7e0a18278a6912bdb0.tar.gz | |
Autogenerated HTML docs for 026351a03507dc3a2e89e068c01234dc55914df2
Diffstat (limited to 'git-archimport.txt')
| -rw-r--r-- | git-archimport.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-archimport.txt b/git-archimport.txt index a2bd788f3..023d3ae7b 100644 --- a/git-archimport.txt +++ b/git-archimport.txt @@ -8,15 +8,15 @@ git-archimport - Import an Arch repository into git SYNOPSIS -------- -`git-archimport` [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ] - [ -D depth ] [ -t tempdir ] - <archive/branch> [ <archive/branch> ] +[verse] +`git-archimport` [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir] + <archive/branch> [ <archive/branch> ] DESCRIPTION ----------- Imports a project from one or more Arch repositories. It will follow branches and repositories within the namespaces defined by the <archive/branch> -parameters suppplied. If it cannot find the remote branch a merge comes from +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). |