From: Junio C Hamano Date: Sun, 13 Aug 2006 16:58:28 GMT Subject: Re: recur status on linux-2.6 Message-ID: <7v64gwmv2j.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Johannes Schindelin writes: > I tested git-merge-recur vs. git-merge-recursive on the linux-2.6 > repository last night. It contains 2298 two-head merges. _All_ of them > come out identically with -recur as compared to -recursive (looking at > the resulting index only). Nice. > That was the good news. The bad news is: it _seems_, that -recur is only > about 6x faster than -recursive, not 10x, and this number becomes smaller, > the longer the merge takes. So I see a startup effect here, probably. Recreating the tip of "next" (10a6653) might be fun. I do not know why, but it ended up having 14 merge bases. The speed-up is about 6x, and the resulting half-merge is worse than recursive (not using rerere cache).