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

Re: [PATCH 1/4] Documentation: enhance branch.<name>.{remote,merge}

From
SBSanti Béjar <santi@agolina.net>
Date
Mar 29, 2009, 10:54 UTC
Message-ID
<adf1fd3d0903290354y7ac26542r8d82309a7247eacc@mail.gmail.com>
In-Reply-To
<76718490903281838s1bc7e908l4702cf9ab020189@mail.gmail.com>
2009/3/29 Jay Soffian <jaysoffian@gmail.com>:
Show 9 quoted lines
> On Sat, Mar 28, 2009 at 7:10 PM, Santi Béjar <santi@agolina.net> wrote:
>>  branch.<name>.merge::
>> +       It defines, together with branch.<name>.remote, the tracking branch
>> +       for the current branch. It tells 'git-fetch'/'git-pull' which
>> +       branch to merge.
>
> I think it would be clearer to say "the upstream branch for the
> current branch", since
> it could very well be a local branch, not necessarily a remote tracking branch.
It makes sense, thanks.
Santi
Previous: Jay SoffianNext: Santi Béjar
Message 4 of 13 in “push.default and branch.<name>.{remote,merge} changes”
  1. 0/4 push.default and branch.<name>.{remote,merge} changesSanti Béjar, Mar 28, 2009
  2. 1/4 Documentation: enhance branch.<name>.{remote,merge}Santi Béjar, Mar 28, 2009
  3. Jay SoffianMar 29, 2009
  4. Santi BéjarMar 29, 2009
  5. 2/4 Documentation: push.default applies to all remotesSanti Béjar, Mar 28, 2009
  6. 3/4 Documentation: branch.*.merge can also afect 'git-push'Santi Béjar, Mar 28, 2009
  7. 4/4 Rename push.default to push.styleSanti Béjar, Mar 28, 2009
  8. Finn Arne GangstadMar 30, 2009
  9. Johannes SchindelinMar 30, 2009
  10. Santi BéjarMar 30, 2009
  11. Santi BéjarMar 30, 2009
  12. Jeff KingMar 30, 2009
  13. Santi BéjarMar 30, 2009

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.