From: Matthias Urlichs <smurf@smurf.noris.de>
Date: Thu, 29 Sep 2005 04:40:14 GMT
Subject: Re: GIT 0.99.7d, and end of week status.
Message-ID: <pan.2005.09.29.04.40.14.655977@smurf.noris.de>
In-Reply-To: <20050927101744.GD30889@pasky.or.cz>

Hi, Petr Baudis wrote:

> However, I still think
> that the user should be required to specify the to-be-merged head manually
> if the default choice isn't explicitly written in the remotes file.

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

-- 
Matthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
 - -
It is not a good omen when goldfish commit suicide.