diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-01-05 20:52:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-05 20:52:50 -0800 |
| commit | 92e802c6ccb96d1b5e8561b0a136d43d82253293 (patch) | |
| tree | 9b6c265d69d1dc8bcce36c86a44674cfb010a6d7 /Documentation/git-archimport.txt | |
| parent | GIT 1.0.6 (diff) | |
| parent | Fix git-symbolic-ref typo in git.txt. (diff) | |
| download | tgif-92e802c6ccb96d1b5e8561b0a136d43d82253293.tar.xz | |
GIT 1.0.7
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-archimport.txt')
| -rw-r--r-- | Documentation/git-archimport.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt index a2bd788f37..023d3ae7b9 100644 --- a/Documentation/git-archimport.txt +++ b/Documentation/git-archimport.txt @@ -8,15 +8,15 @@ git-archimport - Import an Arch repository into git SYNOPSIS -------- -`git-archimport` [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ] - [ -D depth ] [ -t tempdir ] - <archive/branch> [ <archive/branch> ] +[verse] +`git-archimport` [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir] + <archive/branch> [ <archive/branch> ] DESCRIPTION ----------- Imports a project from one or more Arch repositories. It will follow branches and repositories within the namespaces defined by the <archive/branch> -parameters suppplied. If it cannot find the remote branch a merge comes from +parameters supplied. If it cannot find the remote branch a merge comes from it will just import it as a regular commit. If it can find it, it will mark it as a merge whenever possible (see discussion below). |