@matheusbsbs / matheus-bagliano / commits / a5c500b76c
Fork 0

[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>

martin@catalyst.net.nz committed Sep 11, 2005 at 21:26 UTC a5c500b76cfdc3da0f8cb36dadb5f4ba7ecff401
1 file changed +5 -4
Documentation/git-archimport.txt
+5 -4
@@ -3,7 +3,7 @@ git-archimport(1)
3
4 NAME
5 ----
6 -git-archimport - Import an arch repository into git
6 +git-archimport - Import an Arch repository into GIT
7
8
9 SYNOPSIS
@@ -16,8 +16,8 @@ DESCRIPTION
16 Imports a project from one or more Arch repositories. It will follow branches
17 and repositories within the namespaces defined by the <archive/branch>
18 parameters suppplied. If it cannot find the remote branch a merge comes from
19 -it will just import it as a regular merge. If it can find it, it will perform
20 -a merge whenever possible.
19 +it will just import it as a regular commit. If it can find it, it will mark it
20 +as a merge whenever possible (see discussion below).
21
22 The script expects you to provide the key roots where it can start the import
23 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`.
34 For the initial import `git-archimport` expects to find itself in an empty
35 directory. To follow the development of a project that uses Arch, rerun
36 `git-archimport` with the same parameters as the initial import to perform incremental imports.
37 -of a project using Arch.
37
38 +MERGES
39 +------
40 Patch merge data from Arch is used to mark merges in GIT as well. GIT
41 does not care much about tracking patches, and only considers a merge when a
42 branch incorporates all the commits since the point they forked. The end result