author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
Fri, 27 Jun 2008 12:24:47 +0000 (13:24 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 28 Jun 2008 06:36:59 +0000 (23:36 -0700) | ||
commit | ef98c5cafb3e799b1568bb843fcd45920dc62f16 | |
tree | 03fd2a123435f4eaec1f2cbaecba27db4d317ba4 | tree | snapshot |
parent | 5b8e6f85f971dba8eeac048e7821978bbca14121 | commit | diff |
commit-tree: lift completely arbitrary limit of 16 parents
There is no really good reason to have a merge with more than 16
parents, but we have a history of giving our users rope.
Combined with the fact that there was no good reason for that
arbitrary limit in the first place, here is an all-too-easy to fix.
Kind of wished-for by Len Brown.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
There is no really good reason to have a merge with more than 16
parents, but we have a history of giving our users rope.
Combined with the fact that there was no good reason for that
arbitrary limit in the first place, here is an all-too-easy to fix.
Kind of wished-for by Len Brown.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-commit-tree.c | diff | blob | history |