From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Aug 2019 19:34:12 +0000 (-0700)
Subject: Merge branch 'en/fast-import-merge-doc'
X-Git-Tag: v2.24.0-rc0~162
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22e86e85cba1e2697aea46810238ef9b3c7401cf;p=thirdparty%2Fgit.git

Merge branch 'en/fast-import-merge-doc'

Doc update.

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

22e86e85cba1e2697aea46810238ef9b3c7401cf
diff --cc Documentation/git-fast-import.txt
index fad327aecc,28b447a3e6..0bb276269e
--- a/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?
  ....