On Thu, Jun 19, 2008 at 09:23:08AM +0200, Karl Hasselström <kha@xxxxxxxxxxx> wrote: > > Side note: builtin-merge does not have problem with merging 25+ refs > > even in case every ref contains "new" commits. > > So how many parents can a commit have, exactly? Is there a hard limit > somewhere, or just a point beyond which some git tools will start > behaving strangely? AFAIK there is no limit at a core level. git-show-branch has a limit of 25 refs (it can't show more then 25 refs at one time) and git-merge.sh uses show-branch, while builtin-merge does not.
Attachment:
pgpM7RwbQtLhH.pgp
Description: PGP signature
