From 42f4570c86c41c5bfdc72465afc8f1928da69eea Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 18 Dec 2005 17:23:50 -0800 Subject: Documentation/git-archimport: document -o, -a, f, -D options Also, ensure usage help switches are in the same order. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- Documentation/git-archimport.txt | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'Documentation/git-archimport.txt') 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 ] [ ] 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 :: + 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 :: Override the default tempdir. -- cgit v1.3-6-g1900