Re: git-rerere observations and feature suggestions

On 2008-06-19 00:38:21 +0200, Miklos Vajna wrote:

On Wed, Jun 18, 2008 at 03:01:24PM -0700, Jakub Narebski
[off-list ref] wrote:

quoted

As a part of patch series introducing new fast-forward strategies
(--ff=never, --ff=only) there was patch which did merge reduction
before selecting merge strategy, by Sverre Hvammen Johansen
  "[PATCH 4/5] Head reduction before selecting merge strategy"
  http://thread.gmane.org/gmane.comp.version-control.git/80288/focus=80335
(I'm not sure if the link above is to nevest version of patch
series).

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?

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle