summaryrefslogtreecommitdiff
path: root/Documentation/git-archimport.txt
diff options
context:
space:
mode:
authorChristian Meder <chris@absolutegiganten.org>2005-10-05 15:08:26 -0700
committerJunio C Hamano <junkio@cox.net>2005-10-05 15:08:26 -0700
commitf73ae1fc5d5308fecf0a4bdbd7312f7f5b00df55 (patch)
treeaed25558519ec2fdada1fd8b7d17fdf013fa8f6d /Documentation/git-archimport.txt
parente091eb93258f05a58bc5d1c60f058f5f57dd92b6 (diff)
downloadgit-f73ae1fc5d5308fecf0a4bdbd7312f7f5b00df55.tar.gz
Some typos and light editing of various manpages
Typos, light editing and clarifications. Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-archimport.txt')
-rw-r--r--Documentation/git-archimport.txt15
1 files changed, 9 insertions, 6 deletions
diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt
index 6054731741..b6793cf55e 100644
--- a/Documentation/git-archimport.txt
+++ b/Documentation/git-archimport.txt
@@ -20,20 +20,23 @@ 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
-new branches within the provided roots.
+from an 'initial import' or 'tag' type of Arch commit. It will follow and
+import new branches within the provided roots.
It expects to be dealing with one project only. If it sees
-branches that have different roots, it will refuse to run. In that case, edit your
-<archive/branch> parameters to define clearly the scope of the import.
+branches that have different roots, it will refuse to run. In that case,
+edit your <archive/branch> parameters to define clearly the scope of the
+import.
-`git-archimport` uses `tla` extensively in the background to access the Arch repository.
+`git-archimport` uses `tla` extensively in the background to access the
+Arch repository.
Make sure you have a recent version of `tla` available in the path. `tla` must
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.
+`git-archimport` with the same parameters as the initial import to perform
+incremental imports.
MERGES
------