From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 05 May 2011 20:26:01 GMT
Subject: Re: [PATCH 2/2] merge: merge with the default upstream with no argument
Message-ID: <BANLkTik+Kg6Z9jdueMB_LBOAX=NYaPE5Gg@mail.gmail.com>
In-Reply-To: <7vy62l833b.fsf@alter.siamese.dyndns.org>

On Thu, May 5, 2011 at 8:33 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>> 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.
>
> True but that milk was spilled long time ago.  The doc and code at least
> have it spelled correctly, no?

Yeah, but in case somebody read  this thread, as I did.

-- 
Felipe Contreras