Commit 42f4570c authored by Eric Wong's avatar Eric Wong Committed by Junio C Hamano

Documentation/git-archimport: document -o, -a, f, -D options

Also, ensure usage help switches are in the same order.
Signed-off-by: 's avatarEric Wong <normalperson@yhbt.net>
Signed-off-by: 's avatarJunio C Hamano <junkio@cox.net>
parent 3af849a3
......@@ -8,7 +8,8 @@ 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 ]
<archive/branch> [ <archive/branch> ]
DESCRIPTION
......@@ -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 <depth>::
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 <tmpdir>::
Override the default tempdir.
......
......@@ -9,7 +9,8 @@
=head1 Invocation
git-archimport [ -h ] [ -v ] [ -T ] [ -t tempdir ] <archive>/<branch> [ <archive>/<branch> ]
git-archimport [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ]
[ -D depth] [ -t tempdir ] <archive>/<branch> [ <archive>/<branch> ]
Imports a project from one or more Arch repositories. It will follow branches
and repositories within the namespaces defined by the <archive/branch>
......@@ -74,7 +75,7 @@ =head1 Devel Notes
sub usage() {
print STDERR <<END;
Usage: ${\basename $0} # fetch/update GIT from Arch
[ -f ] [ -o ] [ -h ] [ -v ] [ -T ] [ -a ] [ -D depth ] [ -t tempdir ]
[ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ] [ -D depth ] [ -t tempdir ]
repository/arch-branch [ repository/arch-branch] ...
END
exit(1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment