From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jared Hance <jaredhance@gmail.com>
Subject: Re: [PATCH 2/2] merge: merge with the default upstream with no argument
Date: Thu, 5 May 2011 23:26:01 +0300 [thread overview]
Message-ID: <BANLkTik+Kg6Z9jdueMB_LBOAX=NYaPE5Gg@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2011-05-05 20:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-23 23:38 What's cooking in git.git (Mar 2011, #04; Wed, 23) Junio C Hamano
2011-03-24 0:39 ` Martin von Zweigbergk
2011-03-24 5:24 ` Junio C Hamano
2011-03-24 3:47 ` Nguyen Thai Ngoc Duy
2011-03-24 7:30 ` Junio C Hamano
2011-03-24 7:35 ` [PATCH 1/2] merge: match the help text with the documentation Junio C Hamano
2011-03-24 7:39 ` [PATCH 2/2] merge: merge with the default upstream with no argument Junio C Hamano
2011-05-05 14:05 ` Felipe Contreras
2011-05-05 17:33 ` Junio C Hamano
2011-05-05 20:26 ` Felipe Contreras [this message]
2011-03-24 8:00 ` What's cooking in git.git (Mar 2011, #04; Wed, 23) Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='BANLkTik+Kg6Z9jdueMB_LBOAX=NYaPE5Gg@mail.gmail.com' \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jaredhance@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).