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

Re: Odd decision of git-pasky-0.7 to do a merge

From
RKRussell King <rmk@arm.linux.org.uk>
Date
Apr 29, 2005, 20:52 UTC
Message-ID
<20050429215250.E30010@flint.arm.linux.org.uk>
In-Reply-To
<Pine.LNX.4.58.0504291043060.18901@ppc970.osdl.org>
On Fri, Apr 29, 2005 at 10:44:29AM -0700, Linus Torvalds wrote:
Show 11 quoted lines
> On Fri, 29 Apr 2005, Russell King wrote:
> > Why it decided that a merge was necessary is beyond me.  Any ideas?
> > Did Linus forget to merge his tree properly?
> 
> It looks like it was unable to find the right common ancestor.
> 
> If you only had my stuff in it, the common ancestor _should_ have been the 
> parent (c60c390620e0abb60d4ae8c43583714bda27763f), which _should_ have 
> been your old top.
> 
> But maybe merge-base didn't work right?

Yup - pasky-0.7 came out with some weird commit-id, but cogito-0.8 got it right. Now using cogito-0.8 here, so I'm no longer concerned about this particular problem.

-- 
Russell King
Previous: Linus Torvalds
Message 6 of 6 in “Odd decision of git-pasky-0.7 to do a merge”
  1. Russell KingApr 29, 2005
  2. Russell KingApr 29, 2005
  3. Russell KingApr 29, 2005
  4. Petr BaudisApr 29, 2005
  5. Linus TorvaldsApr 29, 2005
  6. Russell KingApr 29, 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.