From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 05 May 2011 14:05:30 GMT
Subject: Re: [PATCH 2/2] merge: merge with the default upstream with no argument
Message-ID: <BANLkTimXFt-RFSPOfv8Ge+boPS_e3NLXkA@mail.gmail.com>
In-Reply-To: <7vd3lharwf.fsf_-_@alter.siamese.dyndns.org>

On Thu, Mar 24, 2011 at 9:39 AM, Junio C Hamano <gitster@pobox.com> wrote:
> "git merge" without specifying any commit is a no-op by default.
>
> A new option merge.defaultupstream can be set to true to cause such an
> invocation of the command to merge the upstream branches configured for
> the current branch by using their last observed values stored in their
> remote tracking branches.

FTR. It's actually merge.defaultotupstream, not merge.defaultupstream.

-- 
Felipe Contreras