From: Junio C Hamano <junkio@cox.net>
Date: Wed, 18 Jan 2006 17:46:33 GMT
Subject: Re: "tla missing -s" equivalent with git/cogito
Message-ID: <7vlkxdwhs6.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <43CE75F0.4060009@op5.se>

Andreas Ericsson <ae@op5.se> writes:

> The "pull" above will do the merging nessecary. You can merge several
> branches at once if you like (known as "doing an octopus" in
> gittish. I imagine that's a star-merge in arch).

Arch star-merge is not an octopus.  They have different "merge
strategy" just like we have more than one.  No, I do not
remember the details of how they do it.