kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

[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>
maint
martin@catalyst.net.nz 2005-09-11 21:26:05 +12:00 committed by Junio C Hamano
parent a4c5f9aab7
commit a5c500b76c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/git-archimport.txt
View File

@ -3,7 +3,7 @@ git-archimport(1)


NAME NAME
---- ----
git-archimport - Import an arch repository into git git-archimport - Import an Arch repository into GIT




SYNOPSIS SYNOPSIS
@ -16,8 +16,8 @@ DESCRIPTION
Imports a project from one or more Arch repositories. It will follow branches Imports a project from one or more Arch repositories. It will follow branches
and repositories within the namespaces defined by the <archive/branch> and repositories within the namespaces defined by the <archive/branch>
parameters suppplied. If it cannot find the remote branch a merge comes from 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 it will just import it as a regular commit. If it can find it, it will mark it
a merge whenever possible. as a merge whenever possible (see discussion below).


The script expects you to provide the key roots where it can start the import 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 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 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 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. `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 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 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 branch incorporates all the commits since the point they forked. The end result