Andrew's git / gitweb.git / blobdiff
?
Merge branch 'mh/release-commit-memory-fix'
[gitweb.git] / Documentation / git-fast-import.txt
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index fad327aecc1b91c0ed48df740c25fd444eb1431b..0bb276269e5e2f9f697f9f965300442591fb353e 100644 (file)
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -391,7 +391,7 @@ change to the project.
        ('encoding' SP <encoding>)?
        data
        ('from' SP <commit-ish> LF)?
-       ('merge' SP <commit-ish> LF)?
+       ('merge' SP <commit-ish> LF)*
        (filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*
        LF?
 ....