{"thread":{"id":"2873","subject":"[PATCH] Documentation/git-archimport: document -o, -a, f, -D options","startedAt":"2005-12-19T01:23:50Z","lastAt":"2005-12-19T01:23:50Z","messageCount":1,"participants":["Eric Wong"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"13796","messageId":"20051219012350.GA5741@mail.yhbt.net","threadId":"2873","inReplyTo":null,"subject":"[PATCH] Documentation/git-archimport: document -o, -a, f, -D options","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2005-12-19T01:23:50Z","receivedAt":"2005-12-19T01:23:50Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Also, ensure usage help switches are in the same order.\n\nSigned-off-by: Eric Wong <normalperson@yhbt.net>\n\n---\n\n Documentation/git-archimport.txt |   23 ++++++++++++++++++++++-\n git-archimport.perl              |    5 +++--\n 2 files changed, 25 insertions(+), 3 deletions(-)\n\n53a88811af9db5cb6287fe0fe9a7d03ab62652c7\ndiff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt\nindex fcda012..a2bd788 100644\n--- a/Documentation/git-archimport.txt\n+++ b/Documentation/git-archimport.txt\n@@ -8,7 +8,8 @@ git-archimport - Import an Arch reposito\n \n SYNOPSIS\n --------\n-`git-archimport` [ -h ] [ -v ] [ -T ] [ -t tempdir ] \n+`git-archimport` [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ]\n+                 [ -D depth ] [ -t tempdir ] \n                  <archive/branch> [ <archive/branch> ]\n \n DESCRIPTION\n@@ -63,6 +64,26 @@ OPTIONS\n \tMany tags. Will create a tag for every commit, reflecting the commit \n \tname in the Arch repository.\n \n+-f::\n+\tUse the fast patchset import strategy.  This can be significantly\n+\tfaster for large trees, but cannot handle directory renames or\n+\tpermissions changes.  The default strategy is slow and safe.\n+\n+-o::\n+\tUse this for compatibility with old-style branch names used by\n+\tearlier versions of git-archimport.  Old-style branch names\n+\twere category--branch, whereas new-style branch names are\n+\tarchive,category--branch--version.\n+\n+-D <depth>::\n+\tFollow merge ancestry and attempt to import trees that have been\n+\tmerged from.  Specify a depth greater than 1 if patch logs have been\n+\tpruned.\n+\n+-a::\n+\tAttempt to auto-register archives at http://mirrors.sourcecontrol.net\n+\tThis is particularly useful with the -D option.\n+\n -t <tmpdir>::\n \tOverride the default tempdir.\n \ndiff --git a/git-archimport.perl b/git-archimport.perl\nindex aab4e38..841738d 100755\n--- a/git-archimport.perl\n+++ b/git-archimport.perl\n@@ -9,7 +9,8 @@\n \n =head1 Invocation\n \n-    git-archimport [ -h ] [ -v ] [ -T ] [ -t tempdir ] <archive>/<branch> [ <archive>/<branch> ]\n+    git-archimport [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ] \n+    \t[ -D depth] [ -t tempdir ] <archive>/<branch> [ <archive>/<branch> ]\n \n Imports a project from one or more Arch repositories. It will follow branches\n and repositories within the namespaces defined by the <archive/branch>\n@@ -74,7 +75,7 @@ our($opt_h,$opt_f,$opt_v,$opt_T,$opt_t,$\n sub usage() {\n     print STDERR <<END;\n Usage: ${\\basename $0}     # fetch/update GIT from Arch\n-       [ -f ] [ -o ] [ -h ] [ -v ] [ -T ] [ -a ] [ -D depth  ] [ -t tempdir ]\n+       [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ] [ -D depth ] [ -t tempdir ]\n        repository/arch-branch [ repository/arch-branch] ...\n END\n     exit(1);\n-- \n0.99.9.GIT\n"}]}