Skip to content

Commit d1387d3

Browse files
newrengitster
authored andcommitted
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 <[email protected]> Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 75b2f01 commit d1387d3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/git-fast-import.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ change to the project.
390390
'committer' (SP <name>)? SP LT <email> GT SP <when> LF
391391
data
392392
('from' SP <commit-ish> LF)?
393-
('merge' SP <commit-ish> LF)?
393+
('merge' SP <commit-ish> LF)*
394394
(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*
395395
LF?
396396
....

0 commit comments

Comments
 (0)