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

Re: remote.<name>.merge missing from the git-config man page?

From
Andreas Schwab <schwab@linux-m68k.org>
Date
Mar 8, 2021, 21:58 UTC
Message-ID
<87a6rd2tp8.fsf@igel.home>
In-Reply-To
<YEaRw5x5hnh9RRyM@nand.local>
On Mär 08 2021, Taylor Blau wrote:
Show 6 quoted lines
> On Mon, Mar 08, 2021 at 09:57:56PM +0100, Andreas Schwab wrote:
>> The configured upstream is the value of branch.<name>.merge, isn't it?
>> That would be the name of a remote, not the name of a branch.
>
> Right; the '<name>' in 'branch.<name>.merge' is your local name for a
> branch, but the value of that configuration is the remote's name.

Sorry, I was misreading branch.<name>.merge as branch.<name>.remote. Now it makes all sense to me.

Andreas.
-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."
Previous: Taylor BlauNext: Junio C Hamano
Message 11 of 14 in “remote.<name>.merge missing from the git-config man page?”
  1. Fabien TerraniMar 8, 2021
  2. Eric SunshineMar 8, 2021
  3. Junio C HamanoMar 8, 2021
  4. Taylor BlauMar 8, 2021
  5. Andreas SchwabMar 8, 2021
  6. Taylor BlauMar 8, 2021
  7. Andreas SchwabMar 8, 2021
  8. Taylor BlauMar 8, 2021
  9. Andreas SchwabMar 8, 2021
  10. Taylor BlauMar 8, 2021
  11. Andreas SchwabMar 8, 2021
  12. Junio C HamanoMar 12, 2021
  13. Jonathan NiederMar 13, 2021
  14. Junio C HamanoMar 8, 2021

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.