From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 27 Jun 2008 12:00:56 GMT
Subject: Re: octopus limit
Message-ID: <alpine.DEB.1.00.0806271259440.9925@racer>
In-Reply-To: <alpine.LFD.1.10.0806262243130.2988@localhost.localdomain>

Hi,

On Thu, 26 Jun 2008, Len Brown wrote:

> it would be nice if a merge of more than 16 branches failed right at the 
> start, rather than chunking along doing merges and then giving up, 
> leaving my repo in an intermediate state.

FWIW I think the rewrite of git-merge as a builtin, which is currently in 
the works, lifts the limit.  However, this is only true if you do not use 
a custom script which calls commit-tree.

Ciao,
Dscho