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

Re: git merge man page, upstream

From
ABAngelo Borsotti <angelo.borsotti@gmail.com>
Date
Oct 23, 2012, 17:30 UTC
Message-ID
<CAB9Jk9C3hybpSNMZE-PYKWS7ZQbC7BwmBkhv9-UaeJXbB_sz3w@mail.gmail.com>
In-Reply-To
<vpqehkpqv3k.fsf@grenoble-inp.fr>
Hi Matthiew,

man pages should be clear, and easy to read. "Remote" usually means "another repository" (git glossary), and also in natural language conveys the notion of something far away. Internally, it can be handled as a special case of url, of course. My suggestion is to be consistent with the git glossary, that defines "upstream branch" as: "The default branch that is merged into the branch in question", which is exactly what that paragraph of the git-merge man page is describing.

-Angelo
Previous: Matthieu MoyNext: Matthieu Moy
Message 5 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.