]> git.ipfire.org Git - thirdparty/git.git/commit
git-fast-import.txt: clarify that multiple merge commits are allowed
authorElijah Newren <newren@gmail.com>
Mon, 12 Aug 2019 17:17:47 +0000 (10:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Aug 2019 20:17:07 +0000 (13:17 -0700)
commitd1387d389549fe6e1b97ad88a0f7dbf3afe96c16
treea56ad46d4b22ecddcda482c5ca0ec9fcc71b41ac
parent75b2f01a0f642b39b0f29b6218515df9b5eb798e
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>
Documentation/git-fast-import.txt