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

Re: Current Issues #3

From
Martin Waitz <tali@admingilde.org>
Date
May 22, 2006, 10:20 UTC
Message-ID
<20060522102029.GE12810@admingilde.org>
In-Reply-To
<7v8xoue9eo.fsf@assigned-by-dhcp.cox.net>
hoi :)
On Mon, May 22, 2006 at 01:44:15AM -0700, Junio C Hamano wrote:
Show 5 quoted lines
>     1. "upstream" refers to the remote section to use when
>        running "git-{fetch,pull,push}" while on that branch.
> 
> 	[branch "master"]
> 		upstream = "origin"
what do you do for [branch "next"] here?

Does it make sense to regard all refs/remotes/*/<branchname> as upstream and merge these into the current branch when pulling?

Perhaps a pull could even merge all newly fetched remote heads into the corresponding branch, but for that we'd need to be able to merge without using the working dir.

-- 
Martin Waitz
Previous: Jakub NarebskiNext: Daniel Barkalow
Message 5 of 8 in “Current Issues #3”
  1. Junio C HamanoMay 22, 2006
  2. Linus TorvaldsMay 22, 2006
  3. SeanMay 22, 2006
  4. Jakub NarebskiMay 23, 2006
  5. Martin WaitzMay 22, 2006
  6. Daniel BarkalowMay 22, 2006
  7. Carl WorthMay 22, 2006
  8. Shawn PearceMay 22, 2006

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.