X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-archimport.txt;h=023d3ae7b96b4cd422fc47458f77921ed62dbd27;hb=21a02335f821c89a989cf0b533d2ae0adb6da16e;hp=a2bd788f379d7d7bec542d3c7538f02934bec844;hpb=c2f3bf071ee90b01f2d629921bb04c4f798f02fa;p=git.git diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt index a2bd788f..023d3ae7 100644 --- a/Documentation/git-archimport.txt +++ b/Documentation/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 ] - [ ] +[verse] +`git-archimport` [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir] + [ ] DESCRIPTION ----------- Imports a project from one or more Arch repositories. It will follow branches and repositories within the namespaces defined by the -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).