summaryrefslogtreecommitdiff
path: root/Documentation/git-archimport.txt
diff options
context:
space:
mode:
authormartin@catalyst.net.nz <martin@catalyst.net.nz>2005-09-11 09:26:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-11 17:51:51 (GMT)
commita5c500b76cfdc3da0f8cb36dadb5f4ba7ecff401 (patch)
treeafb118a2d2f5b6a884eb0455fef0c4bbd0d1e204 /Documentation/git-archimport.txt
parenta4c5f9aab740b6d3972c395d4b1af10c2026244b (diff)
downloadgit-a5c500b76cfdc3da0f8cb36dadb5f4ba7ecff401.zip
git-a5c500b76cfdc3da0f8cb36dadb5f4ba7ecff401.tar.gz
git-a5c500b76cfdc3da0f8cb36dadb5f4ba7ecff401.tar.bz2
[PATCH] archimport documentation tidyup
New "merges" headline, clarified some parts that were not easy to understand. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-archimport.txt')
-rw-r--r--Documentation/git-archimport.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt
index b134835..fa0779b 100644
--- a/Documentation/git-archimport.txt
+++ b/Documentation/git-archimport.txt
@@ -3,7 +3,7 @@ git-archimport(1)
NAME
----
-git-archimport - Import an arch repository into git
+git-archimport - Import an Arch repository into GIT
SYNOPSIS
@@ -16,8 +16,8 @@ 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
-it will just import it as a regular merge. If it can find it, it will perform
-a merge whenever possible.
+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).
The script expects you to provide the key roots where it can start the import
from an 'initial import' or 'tag' type of Arch commit. It will follow and import
@@ -34,8 +34,9 @@ know about the repositories you pass to `git-archimport`.
For the initial import `git-archimport` expects to find itself in an empty
directory. To follow the development of a project that uses Arch, rerun
`git-archimport` with the same parameters as the initial import to perform incremental imports.
-of a project using Arch.
+MERGES
+------
Patch merge data from Arch is used to mark merges in GIT as well. GIT
does not care much about tracking patches, and only considers a merge when a
branch incorporates all the commits since the point they forked. The end result