From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Mon, 31 Jan 2011 20:32:54 GMT
Subject: Re: [1.8.0] default "git merge" without argument to "git merge @{u}"
Message-ID: <AANLkTintp8Je8msnn5X+T8MwvNjSrKm5m8KvshiWEuum@mail.gmail.com>
In-Reply-To: <7vaaig6d64.fsf@alter.siamese.dyndns.org>

On Mon, Jan 31, 2011 at 10:17 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Jeff King <peff@peff.net> writes:
>
>>> In 1.8.0, flip the default for merge.defaultUpstream to true.
>>
>> Other than that, I think the proposal and migration plan are fine.
>
> Heh, thanks.
>
> It's not my proposal though ;-).  It is just an illustration of how I see
> an item from people's wishlist should look like to make it easier to
> discuss them.

Ok, I share the same opinion as Jeff; we should not care about scripts
doing something so wrong. But if the migration path is the only way to
get the change in, I guess I can do that.

-- 
Felipe Contreras