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 /Documentation/git-archimport.txt | |
| parent | howto/using-topic-branches: Recommend public URL git://git.kernel.org/ (diff) | |
| download | tgif-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>
Diffstat (limited to 'Documentation/git-archimport.txt')
| -rw-r--r-- | Documentation/git-archimport.txt | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt index fcda0125af..a2bd788f37 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. |