Andrew's git / gitweb.git / diff
?
Merge branch 'en/fast-import-merge-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Aug 2019 19:34:12 +0000 (12:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Aug 2019 19:34:12 +0000 (12:34 -0700)
Doc update.

* en/fast-import-merge-doc:
git-fast-import.txt: clarify that multiple merge commits are allowed

Documentation/git-fast-import.txt patch | blob | history
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?
 ....