git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] merge: merge with the default upstream with no argument

From
Junio C Hamano <gitster@pobox.com>
Date
May 5, 2011, 17:33 UTC
Message-ID
<7vy62l833b.fsf@alter.siamese.dyndns.org>
In-Reply-To
<BANLkTimXFt-RFSPOfv8Ge+boPS_e3NLXkA@mail.gmail.com>
Felipe Contreras <felipe.contreras@gmail.com> writes:
Show 9 quoted lines
> 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?

Previous: Felipe ContrerasNext: Felipe Contreras
Message 9 of 11 in “What's cooking in git.git (Mar 2011, #04; Wed, 23)”
  1. Junio C HamanoMar 23, 2011
  2. Martin von ZweigbergkMar 24, 2011
  3. Junio C HamanoMar 24, 2011
  4. Nguyen Thai Ngoc DuyMar 24, 2011
  5. Junio C HamanoMar 24, 2011
  6. 1/2 merge: match the help text with the documentationJunio C Hamano, Mar 24, 2011
  7. 2/2 merge: merge with the default upstream with no argumentJunio C Hamano, Mar 24, 2011
  8. Felipe ContrerasMay 5, 2011
  9. Junio C HamanoMay 5, 2011
  10. Felipe ContrerasMay 5, 2011
  11. Junio C HamanoMar 24, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.