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

git merge man page, upstream

From
ABAngelo Borsotti <angelo.borsotti@gmail.com>
Date
Oct 23, 2012, 07:40 UTC
Message-ID
<CAB9Jk9BT3F1_yvf7jQQyT72_EWskFS4bEgXCkmJs7uZOPhEK8w@mail.gmail.com>
Hello,
the git merge man page, OPTIONS, <commit> ... states:
   "If no commit is given from the command line, and if
merge.defaultToUpstream configuration variable is set, merge the
remote tracking branches that the current branch is configured to use
as its upstream. See also the configuration section of this manual
page."

Actually, in this case git merge merges the upstream branch, not the remote tracking branch.

Proposed change:
   "If no commit is given from the command line, and if
merge.defaultToUpstream configuration variable is set, merge the
upstream branches that the current branch has currently configured.
See also the configuration section of this manual page."
-Angelo Borsotti
Next: Matthieu Moy
Message 1 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.