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

Re: git merging

From
Linus Torvalds <torvalds@osdl.org>
Date
Jun 21, 2005, 15:53 UTC
Message-ID
<Pine.LNX.4.58.0506210851260.2268@ppc970.osdl.org>
In-Reply-To
<20050621145919.GB12271@suse.de>
On Tue, 21 Jun 2005, Jens Axboe wrote:
> 
> Isn't that a little 'end user' confusing from a usability point of view,
> that it behaves differently depending on which pull script it ends up
> using in the end?

Yes, I'm not claiming it's good, I'm just claiming it explains what you see ;)

So it's a bug, but I'm hoping somebody else will fix it. I've not actually worked on that "intelligent pull" functionality at all (aside from making the ssh-push thing work for my limited use).

			Linus
Previous: Jens Axboe
Message 16 of 16 in “Re: git merging”
  1. Linus TorvaldsJun 17, 2005
  2. Jens AxboeJun 17, 2005
  3. Jeff GarzikJun 17, 2005
  4. Linus TorvaldsJun 17, 2005
  5. Jeff GarzikJun 17, 2005
  6. Linus TorvaldsJun 18, 2005
  7. Jens AxboeJun 20, 2005
  8. Matthias UrlichsJun 20, 2005
  9. Jens AxboeJun 20, 2005
  10. Linus TorvaldsJun 20, 2005
  11. Daniel BarkalowJun 20, 2005
  12. Matthias UrlichsJun 20, 2005
  13. Jens AxboeJun 20, 2005
  14. Linus TorvaldsJun 20, 2005
  15. Jens AxboeJun 21, 2005
  16. Linus TorvaldsJun 21, 2005

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.