From: Shawn O. Pearce Date: Thu, 29 Jul 2010 02:19:46 GMT Subject: Re: What is the scenario for a commit with 3 or more parents Message-ID: <20100729021946.GG25268@spearce.org> In-Reply-To: Bradley Wagner wrote: > I was reading over the Specifying Revisions section in the man entry > gitrevisions. I understand having 2 parent commits with a merge. > > I was trying to understand the HEAD^2 style syntax and wondering where > HEAD^3 would be used. From the example diagram, this would be Commit B > but I'm unclear how this would ever happen. Is this some kind of > multi-way merge? 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`. > Does git log show the parents in their ordinal order in the "Merge:" line? Yes. -- Shawn.