X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-archimport.txt;h=fe57fe1e92fd69054e5d41ceae7d0f7519218d5e;hb=50b4e0c178777a27164eb67676593255a9cbd035;hp=fcda0125af92ff9c3d72d711a78d23118787608c;hpb=302ebfe52192fff9a2c1c612dff22325fd073acc;p=git.git diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt index fcda0125..fe57fe1e 100644 --- a/Documentation/git-archimport.txt +++ b/Documentation/git-archimport.txt @@ -8,14 +8,15 @@ git-archimport - Import an Arch repository into git SYNOPSIS -------- -`git-archimport` [ -h ] [ -v ] [ -T ] [ -t tempdir ] +`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). @@ -63,6 +64,26 @@ OPTIONS Many tags. Will create a tag for every commit, reflecting the commit name in the Arch repository. +-f:: + Use the fast patchset import strategy. This can be significantly + faster for large trees, but cannot handle directory renames or + permissions changes. The default strategy is slow and safe. + +-o:: + Use this for compatibility with old-style branch names used by + earlier versions of git-archimport. Old-style branch names + were category--branch, whereas new-style branch names are + archive,category--branch--version. + +-D :: + Follow merge ancestry and attempt to import trees that have been + merged from. Specify a depth greater than 1 if patch logs have been + pruned. + +-a:: + Attempt to auto-register archives at http://mirrors.sourcecontrol.net + This is particularly useful with the -D option. + -t :: Override the default tempdir.