diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-30 18:06:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-30 18:06:39 -0800 |
| commit | e634aec752642dcf86c3fc82025e43381d6768c2 (patch) | |
| tree | a589b6756894d18c841ac61499e5d2c9beda36fd /Documentation/git-archimport.txt | |
| parent | a1c7a69047e88244ed321b5aa2a8bcbba5a869c2 (diff) | |
| parent | 80e0c0ab91e1cf6a6315d0431bf6873ebbf8bef0 (diff) | |
| download | git-0.99.9a.tar.xz | |
GIT 0.99.9av0.99.9a
... to contain the RPM workaround.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-archimport.txt')
| -rw-r--r-- | Documentation/git-archimport.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt index b6793cf55e..fcda0125af 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 |