From: Simon Hausmann Date: Wed, 7 Feb 2007 22:09:49 +0000 (+0100) Subject: Fixed incremental imports by using the correct "from" command instead of "merge"... X-Git-Tag: v1.5.3-rc0~65^2^2~223 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e3d37cf0980646b3dbc19e01684c665482a3129d;p=git.git Fixed incremental imports by using the correct "from" command instead of "merge" with git fast-import. Signed-off-by: Simon Hausmann --- diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py index 06de0eae6..3e573cd78 100755 --- a/contrib/fast-import/p4-fast-export.py +++ b/contrib/fast-import/p4-fast-export.py @@ -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