From: Junio C Hamano Date: Wed, 09 Nov 2005 00:59:41 GMT Subject: Re: Comments on recursive merge.. Message-ID: <7vlkzyd4aq.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Linus Torvalds writes: > Junio? You even wrote the comment about the case in git-merge-base, I'm > wondering whether it's a bug that we use the fast-and-cheap algorithm in > git-show-branch.. I did show-branch soon after we worked on those pathlogical merge-base fix, so I would be a bit surprised if I did it without using all the knowledge from that exercise, but I do not remember offhand. The core logic should be simple generalization of two-head merge-base to N heads.