git-fast-import.txt: clarify that multiple merge commits are allowed
The grammar for commits used a '?' rather than a '*' on the `merge` directive line, despite the fact that the code allows multiple `merge` directives in order to support n-way merges. In fact, elsewhere in git-fast-import.txt there is an explicit declaration that "an unlimited number of `merge` commands per commit are permitted by fast-import". Fix the grammar to match the intent and implementation. Reported-by: Joachim Klein <joachim.klein@automata.tools> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 12, 2019 at 10:17 UTC
d1387d389549fe6e1b97ad88a0f7dbf3afe96c16
1 file changed
+1
-1
Documentation/git-fast-import.txt
+1
-1
@@ -390,7 +390,7 @@ change to the project.
390
'committer' (SP <name>)? SP LT <email> GT SP <when> LF
391
data
392
('from' SP <commit-ish> LF)?
393
- ('merge' SP <commit-ish> LF)?
393
+ ('merge' SP <commit-ish> LF)*
394
(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*
395
LF?
396
....