From: Clemens Buchacher <drizzd@aon.at>
Date: Sun, 10 Oct 2010 17:45:21 GMT
Subject: Re: Useful tracking branches and auto merging
Message-ID: <20101010174521.GC15495@localhost>
In-Reply-To: <AANLkTimFYExqr_OcYMJ0kTv5K-wtu3pzsAu=rhq+19W-@mail.gmail.com>

On Sun, Oct 10, 2010 at 08:30:22PM +0300, Felipe Contreras wrote:
> 
> There's no magic involved, it's just what you would expect, what else
> should 'git merge' (without arguments) do?

I would expect it to do nothing, or just output a usage. The
proposed behavior is also unexpected because git-pull already does
(almost) the same thing.

Clemens