From: Jakub Narebski <jnareb@gmail.com>
Date: Sat, 18 Nov 2006 00:32:25 GMT
Subject: Re: [DRAFT] Branching and merging with git
Message-ID: <ejlk82$av5$1@sea.gmane.org>
In-Reply-To: <20061118001355.23488.qmail@science.horizon.com>

linux@horizon.com wrote:

[...]
> (Are there any octopus merges in git's history?  If not, could I ask
> for one for pedagogical value?)

See commit d425142e2a045a9dd7879d028ec68bd748df48a3 (most legged octopus
I found in git.git repository). Doing git-rev-parse --parents -all, or 
git log --all and greppoing for merges is a good idea to find octopi.

The commit is both v1.1.2-gd425142 (git describe) and tags/v1.2.0^0~143 
(git name-rev --tags)
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git