From: Sverre Rabbelier Date: Thu, 29 Jul 2010 17:55:18 GMT Subject: Re: What is the scenario for a commit with 3 or more parents Message-ID: In-Reply-To: <20100729021946.GG25268@spearce.org> Heya, On Wed, Jul 28, 2010 at 21:19, Shawn O. Pearce wrote: > Yes.  Its called an octopus merge.  It happpens sometimes when > merging 2 or more otherwise fairly isolated changes in a single > shot.  E.g. `git merge feature-a feature-b thing-c`. Do we have an explanation anywhere as to when one would use a octopus merge? -- Cheers, Sverre Rabbelier