summaryrefslogtreecommitdiff
path: root/t/t4211
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2019-08-12 10:17:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-12 13:17:07 -0700
commitd1387d389549fe6e1b97ad88a0f7dbf3afe96c16 (patch)
treea56ad46d4b22ecddcda482c5ca0ec9fcc71b41ac /t/t4211
parentGit 2.22.1 (diff)
downloadtgif-d1387d389549fe6e1b97ad88a0f7dbf3afe96c16.tar.xz
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>
Diffstat (limited to 't/t4211')
0 files changed, 0 insertions, 0 deletions