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

Re: [PATCH] Add support for merging from upstream by default.

From
Bert Wesarg <bert.wesarg@googlemail.com>
Date
Feb 7, 2011, 09:36 UTC
Message-ID
<AANLkTikii-fx5nYeBDc70eh_wj05sEZ6fH6=bF9GqHBK@mail.gmail.com>
In-Reply-To
<1296912681-4161-1-git-send-email-jaredhance@gmail.com>
On Sat, Feb 5, 2011 at 14:31, Jared Hance <jaredhance@gmail.com> wrote:
> Adds the option merge.defaultupstream to add support for merging from the
> upstream branch by default. The upstream branch is found using
> branch.[name].upstream.

Why do we need a per branch config for this, isn't .origin/.merge enough? Or, where is the connection between your new .upstream and the @{upstream} ref?

Bert
Previous: Junio C HamanoNext: Bert Wesarg
Message 5 of 6 in “Add support for merging from upstream by default.”
  1. Add support for merging from upstream by default.Jared Hance, Feb 5, 2011
  2. Andreas SchwabFeb 5, 2011
  3. Add support for merging from upstream by default.Jared Hance, Feb 5, 2011
  4. Junio C HamanoFeb 7, 2011
  5. Bert WesargFeb 7, 2011
  6. Bert WesargFeb 7, 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.