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-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/22e86e85cba1e2697aea46810238ef9b3c7401cf?ds=inline;hp=-c

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 --combined 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?
  ....
@@@ -425,7 -424,7 +425,7 @@@ the same commit, as `filedeleteall` wip
  
  The `LF` after the command is optional (it used to be required).  Note
  that for reasons of backward compatibility, if the commit ends with a
 -`data` command (i.e. it has has no `from`, `merge`, `filemodify`,
 +`data` command (i.e. it has no `from`, `merge`, `filemodify`,
  `filedelete`, `filecopy`, `filerename`, `filedeleteall` or
  `notemodify` commands) then two `LF` commands may appear at the end of
  the command instead of just one.
@@@ -456,12 -455,6 +456,12 @@@ that was selected by the --date-format=
  See ``Date Formats'' above for the set of supported formats, and
  their syntax.
  
 +`encoding`
 +^^^^^^^^^^
 +The optional `encoding` command indicates the encoding of the commit
 +message.  Most commits are UTF-8 and the encoding is omitted, but this
 +allows importing commit messages into git without first reencoding them.
 +
  `from`
  ^^^^^^
  The `from` command is used to specify the commit to initialize