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

Re: git merge man page, upstream

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Oct 23, 2012, 11:35 UTC
Message-ID
<vpqehkpqv3k.fsf@grenoble-inp.fr>
In-Reply-To
<CAB9Jk9CEbT=Y=yjw2tPSLiLibejDSheabcBPEpHCLa_TS+6Cpw@mail.gmail.com>
Angelo Borsotti <angelo.borsotti@gmail.com> writes:
> Hi Matthieu,
>
> the upstream branch can also be a local branch.
In this case, it's:
[branch "branch"]
        remote = .
        merge = refs/heads/master

which can arguably be considered as a special case of remote branch whose location happens to be ".". But as said in the patch, I don't mind if someone wants to drop the remote-tracking mention on top of my patch.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Angelo BorsottiNext: Angelo Borsotti
Message 4 of 7 in “git merge man page, upstream”
  1. Angelo BorsottiOct 23, 2012
  2. Matthieu MoyOct 23, 2012
  3. Angelo BorsottiOct 23, 2012
  4. Matthieu MoyOct 23, 2012
  5. Angelo BorsottiOct 23, 2012
  6. Documentation: remote tracking branch -> remote-tracking branchMatthieu Moy, Oct 23, 2012
  7. Jeff KingOct 25, 2012

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.