From: Junio C Hamano Date: Thu, 19 Jun 2008 07:30:43 GMT Subject: Re: git-rerere observations and feature suggestions Message-ID: <7v7iclx4nw.fsf@gitster.siamese.dyndns.org> In-Reply-To: <20080619072308.GA12727@diana.vm.bytemark.co.uk> Karl Hasselström writes: > 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? There is no hard limit at the data structure level. git-commit-tree has a hard limit of accepting 16 parents. git-blame has the same 16-parent limit while following the history (but the one in 'next' has lifted the latter limitation). But that is purely academic. Anybody who does an octopus with more than 8 legs should get his head examined ;-).