@matheusbsbs / matheus-bagliano / commits / 42f4570c86
Fork 0

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>

Eric Wong committed Dec 18, 2005 at 17:23 UTC 42f4570c86c41c5bfdc72465afc8f1928da69eea
2 files changed +25 -3
Documentation/git-archimport.txt
+22 -1
@@ -8,7 +8,8 @@ git-archimport - Import an Arch repository into git
8
9 SYNOPSIS
10 --------
11 -`git-archimport` [ -h ] [ -v ] [ -T ] [ -t tempdir ]
11 +`git-archimport` [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ]
12 + [ -D depth ] [ -t tempdir ]
13 <archive/branch> [ <archive/branch> ]
14
15 DESCRIPTION
@@ -63,6 +64,26 @@ OPTIONS
64 Many tags. Will create a tag for every commit, reflecting the commit
65 name in the Arch repository.
66
67 +-f::
68 + Use the fast patchset import strategy. This can be significantly
69 + faster for large trees, but cannot handle directory renames or
70 + permissions changes. The default strategy is slow and safe.
71 +
72 +-o::
73 + Use this for compatibility with old-style branch names used by
74 + earlier versions of git-archimport. Old-style branch names
75 + were category--branch, whereas new-style branch names are
76 + archive,category--branch--version.
77 +
78 +-D <depth>::
79 + Follow merge ancestry and attempt to import trees that have been
80 + merged from. Specify a depth greater than 1 if patch logs have been
81 + pruned.
82 +
83 +-a::
84 + Attempt to auto-register archives at http://mirrors.sourcecontrol.net
85 + This is particularly useful with the -D option.
86 +
87 -t <tmpdir>::
88 Override the default tempdir.
89
git-archimport.perl
+3 -2
@@ -9,7 +9,8 @@
9
10 =head1 Invocation
11
12 - git-archimport [ -h ] [ -v ] [ -T ] [ -t tempdir ] <archive>/<branch> [ <archive>/<branch> ]
12 + git-archimport [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ]
13 + [ -D depth] [ -t tempdir ] <archive>/<branch> [ <archive>/<branch> ]
14
15 Imports a project from one or more Arch repositories. It will follow branches
16 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);
75 sub usage() {
76 print STDERR <<END;
77 Usage: ${\basename $0} # fetch/update GIT from Arch
77 - [ -f ] [ -o ] [ -h ] [ -v ] [ -T ] [ -a ] [ -D depth ] [ -t tempdir ]
78 + [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ] [ -D depth ] [ -t tempdir ]
79 repository/arch-branch [ repository/arch-branch] ...
80 END
81 exit(1);