From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sun, 10 Oct 2010 17:30:22 GMT
Subject: Re: Useful tracking branches and auto merging
Message-ID: <AANLkTimFYExqr_OcYMJ0kTv5K-wtu3pzsAu=rhq+19W-@mail.gmail.com>
In-Reply-To: <20101010171505.GA15495@localhost>

On Sun, Oct 10, 2010 at 8:15 PM, Clemens Buchacher <drizzd@aon.at> wrote:
> On Mon, Oct 04, 2010 at 11:56:02PM +0300, Felipe Contreras wrote:
>>
>> Moreover, wouldn't it make sense to make 'git merge' = 'git merge
>> @{u}'?
>
> Isn't that what 'git pull' does? Especially after using 'git
> fetch'?

No, it hits the network again: git pull = git fetch + git merge @{u}

If I already did 'git fetch' why should I do it again?

> I prefer 'git merge' as one of the few git commands without magic
> behavior and DWIMery.

There's no magic involved, it's just what you would expect, what else
should 'git merge' (without arguments) do?

-- 
Felipe Contreras