From d1387d389549fe6e1b97ad88a0f7dbf3afe96c16 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Mon, 12 Aug 2019 10:17:47 -0700 Subject: [PATCH] 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 Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- Documentation/git-fast-import.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index d65cdb3d08..28b447a3e6 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -390,7 +390,7 @@ change to the project. 'committer' (SP )? SP LT GT SP LF data ('from' SP LF)? - ('merge' SP LF)? + ('merge' SP LF)* (filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)* LF? .... -- 2.39.2