From: Junio C Hamano <junkio@cox.net>
Date: Thu, 29 Sep 2005 05:11:20 GMT
Subject: Re: GIT 0.99.7d, and end of week status.
Message-ID: <7vk6h0o3uv.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <pan.2005.09.29.04.40.14.655977@smurf.noris.de>

Matthias Urlichs <smurf@smurf.noris.de> writes:

> I tend to agree -- intentional octopus merges are rare enough.
> For most people, anyway. ;-)

I agree, *and* I think what I proposed is consistent with that.
Essentially, you cannot create an Octopus without asking from
the command line, period.