diff options
| author | Eric Wong <normalperson@yhbt.net> | 2005-12-18 17:23:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-19 01:51:16 -0800 |
| commit | 42f4570c86c41c5bfdc72465afc8f1928da69eea (patch) | |
| tree | e6f695b0c3b54cc88554e3b511dae494a0df320a | |
| parent | 3af849a3dae9442767668cd2045e360225724558 (diff) | |
| download | git-42f4570c86c41c5bfdc72465afc8f1928da69eea.tar.gz git-42f4570c86c41c5bfdc72465afc8f1928da69eea.tar.xz | |
Documentation/git-archimport: document -o, -a, f, -D options
Also, ensure usage help switches are in the same order.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-archimport.txt | 23 | ||||
| -rwxr-xr-x | git-archimport.perl | 5 |
2 files changed, 25 insertions, 3 deletions
diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt index fcda0125a..a2bd788f3 100644 --- a/Documentation/git-archimport.txt +++ b/Documentation/git-archimport.txt @@ -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. diff --git a/git-archimport.perl b/git-archimport.perl index aab4e3844..841738d5c 100755 --- a/git-archimport.perl +++ b/git-archimport.perl @@ -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 @@ our($opt_h,$opt_f,$opt_v,$opt_T,$opt_t,$opt_D,$opt_a,$opt_o); 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); |