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

Fixed incremental imports by using the correct "from" command instead of "merge" with git fast-import. 

Signed-off-by: Simon Hausmann <hausmann@kde.org>
maint
Simon Hausmann 2007-02-07 23:09:49 +01:00
parent c4cf2d4f87
commit e3d37cf098
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/fast-import/p4-fast-export.py
View File

@ -88,7 +88,7 @@ def commit(details):
gitStream.write("EOT\n\n")

if len(initialParent) > 0:
gitStream.write("merge %s\n" % initialParent)
gitStream.write("from %s\n" % initialParent)
initialParent = ""

fnum = 0