From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 03 Jun 2008 07:53:26 GMT
Subject: Re: Octopus merge: unique (?) to git, but is it useful?
Message-ID: <7vskvv2bux.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <200806030932.03051.jnareb@gmail.com>

Jakub Narebski <jnareb@gmail.com> writes:

> [*1*] I assume that this kind of merge is called 'octopus' because it
>       has more than two "legs" (parents), and not for example because
>       first such merge had 8 parents?

The first one ever was actually a pentapus, 211232b (Octopus merge of the
following five patches., 2005-05-05).

"gitk 211232b" was a beautiful sight back then, and it still is.  The
history was much simpler back then.