From: martin@catalyst.net.nz
To: git@vger.kernel.org
Cc: Martin Langhoff <martin@catalyst.net.nz>
Subject: [PATCH 2/5] archimport documentation tidyup
Date: Sun, 11 Sep 2005 21:26:05 +1200 [thread overview]
Message-ID: <1126430765435-git-send-email-martin@catalyst.net.nz> (raw)
In-Reply-To: <11264307651299-git-send-email-martin@catalyst.net.nz>
New "merges" headline, clarified some parts that were not easy to understand.
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
---
Documentation/git-archimport.txt | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
da341e8530b0d852c9b6910778df6b41cdee3e54
diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt
--- 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
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
next prev parent reply other threads:[~2005-09-11 9:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-11 9:26 archimport documentation updates and tidyups martin
2005-09-11 9:26 ` [PATCH 1/5] archimport documentation update martin
2005-09-11 9:26 ` martin [this message]
2005-09-11 9:26 ` [PATCH 3/5] archimport - update in-script doco, options tidyup martin
2005-09-11 9:26 ` [PATCH 4/5] archimport - use GIT_DIR instead of hardcoded ".git" martin
2005-09-11 9:26 ` [PATCH 5/5] archimport - better handling of temp dirs martin
2005-09-11 14:58 ` [PATCH 1/5] archimport documentation update A Large Angry SCM
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1126430765435-git-send-email-martin@catalyst.net.nz \
--to=martin@catalyst.net.nz \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).