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 9, 2006, 06:13 UTC
Message-ID
<Pine.LNX.4.64.0601082212420.3169@g5.osdl.org>
In-Reply-To
<46a038f90601082208i95cd19fmda542da0da8cc9ef@mail.gmail.com>
On Mon, 9 Jan 2006, Martin Langhoff wrote:
> 
> and if it does anything but a very trivial merge, backtrack and do a merge.

To be fair, backtracking a "git-rebase" isn't obvious. One of the downsides of rebasing.

		Linus
Previous: Martin LanghoffNext: Junio C Hamano
Message 3 of 4 in “RE: git pull on Linux/ACPI release tree”
  1. Brown, LenJan 9, 2006
  2. Martin LanghoffJan 9, 2006
  3. Linus TorvaldsJan 9, 2006
  4. Junio C HamanoJan 9, 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.