summaryrefslogtreecommitdiff
path: root/Documentation/git-archimport.txt
diff options
context:
space:
mode:
authorChristian Meder <chris@absolutegiganten.org>2005-10-10 23:01:31 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-10 23:01:31 (GMT)
commit72e9340cfde90189d76ef3c8a4793ea7764ff8ee (patch)
tree2d2be1c4fe841de12630495929e2ac394f58012c /Documentation/git-archimport.txt
parent98438bd0e893c23186fb82ea8b04964c0f1ef9d1 (diff)
downloadgit-72e9340cfde90189d76ef3c8a4793ea7764ff8ee.zip
git-72e9340cfde90189d76ef3c8a4793ea7764ff8ee.tar.gz
git-72e9340cfde90189d76ef3c8a4793ea7764ff8ee.tar.bz2
Convert usage of GIT and Git into git
Convert usage of GIT and Git into git. 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.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt
index b6793cf..fcda012 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
@@ -40,14 +40,14 @@ incremental imports.
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
branch incorporates all the commits since the point they forked. The end result
-is that GIT will have a good idea of how far branches have diverged. So the
+is that git will have a good idea of how far branches have diverged. So the
import process does lose some patch-trading metadata.
Fortunately, when you try and merge branches imported from Arch,
-GIT will find a good merge base, and it has a good chance of identifying
+git will find a good merge base, and it has a good chance of identifying
patches that have been traded out-of-sequence between the branches.
OPTIONS