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

Re: git pull on Linux/ACPI release tree

From
Linus Torvalds <torvalds@osdl.org>
Date
Jan 8, 2006, 19:57 UTC
Message-ID
<Pine.LNX.4.64.0601081156430.3169@g5.osdl.org>
In-Reply-To
<7vace61plu.fsf@assigned-by-dhcp.cox.net>
On Sun, 8 Jan 2006, Junio C Hamano wrote:
> 
> Careful.  I do not think rebase works across merges at all.

Right. You have to do one or the other (rebase your changes to another tree _or_ merge another tree into your changes), but not mix the two.

		Linus
Previous: Junio C HamanoNext: Tony Luck
Message 9 of 21 in “RE: git pull on Linux/ACPI release tree”
  1. Brown, LenJan 8, 2006
  2. Linus TorvaldsJan 8, 2006
  3. Martin LanghoffJan 8, 2006
  4. Linus TorvaldsJan 8, 2006
  5. David S. MillerJan 8, 2006
  6. Luben TuikovJan 8, 2006
  7. Linus TorvaldsJan 9, 2006
  8. Junio C HamanoJan 8, 2006
  9. Linus TorvaldsJan 8, 2006
  10. Tony LuckJan 8, 2006
  11. Adrian BunkJan 8, 2006
  12. Willy TarreauJan 8, 2006
  13. Linus TorvaldsJan 9, 2006
  14. Adrian BunkJan 10, 2006
  15. Martin LanghoffJan 10, 2006
  16. Andreas EricssonJan 11, 2006
  17. Greg KHJan 12, 2006
  18. Adrian BunkJan 13, 2006
  19. Martin LanghoffJan 9, 2006
  20. Linus TorvaldsJan 10, 2006
  21. Catalin MarinasJan 12, 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.