git-fast-import.txt: clarify that multiple merge commits are allowed
PATCH 1/1 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]>
--- Documentation/git-fast-import.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/git-fast-import.txt +1 -1
@@ -390,7 +390,7 @@ change to the project. 'committer' (SP <name>)? SP LT <email> GT SP <when> LF data ('from' SP <commit-ish> LF)? - ('merge' SP <commit-ish> LF)? + ('merge' SP <commit-ish> LF)* (filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)* LF? ....
Signature · 1 line
2.22.0.661.gd1c9dd82fc.dirty