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

1  2 
Documentation/git-fast-import.txt patch | diff1 | diff2 | blob | history
diff --cc Documentation/git-fast-import.txt
index fad327aecc1b91c0ed48df740c25fd444eb1431b,28b447a3e644066beff4bb77831f97b48b49727f..0bb276269e5e2f9f697f9f965300442591fb353e
--- 1/Documentation/git-fast-import.txt
--- 2/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@@ -388,10 -388,9 +388,10 @@@ change to the project
        original-oid?
        ('author' (SP <name>)? SP LT <email> GT SP <when> LF)?
        'committer' (SP <name>)? SP LT <email> GT SP <when> LF
 +      ('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?
  ....