X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-archimport.html;h=1ef3969268c3dfbb6509a1f62086a4a4b6be425d;hb=b59a8af8f9bf6861ff8fc32c3f730daea6fa32b1;hp=c9046603f389ffa95e23ae8e7ca842f06a7d2099;hpb=1a4e841b439ba014b365999c3a6b9e2be3740bd8;p=git.git diff --git a/git-archimport.html b/git-archimport.html index c9046603..1ef39692 100644 --- a/git-archimport.html +++ b/git-archimport.html @@ -272,15 +272,15 @@ git-archimport(1) Manual Page

SYNOPSIS

-

git-archimport [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ] - [ -D depth ] [ -t tempdir ] - <archive/branch> [ <archive/branch> ]

+
+
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).

The script expects you to provide the key roots where it can start the import @@ -410,7 +410,7 @@ patches that have been traded out-of-sequence between the branches.