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

Fwd: cg-merge should use git-merge

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Oct 19, 2005, 11:21 UTC
Message-ID
<46a038f90510190421l50b2c12k495db23b62015782@mail.gmail.com>
In-Reply-To
<46a038f90510161644l35119401rdc05c081506ae715@mail.gmail.com>

Resending a post that never made it to the list due to a bug at my end, and I think warrants some more discussion. Unfortunately, I'm bug-fixing at the moment, so implementing this has taken a backseat.

---------- Forwarded message ----------
From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Oct 17, 2005 12:44 PM
Subject: cg-merge should use git-merge
To: Petr Baudis <pasky@ucw.cz>, Git Mailing List <git@vger.kernel.org>
Petr,

After using git-merge a few times by hand to test-drive the new merge drivers, I'm sold on the idea, and I 'd like to have cg-merge use git-merge directly. I'll try and find the time one of these evenings to outline something, but I guess it's pretty core to Cogito, so I'm after some direction from you ;)

martin
Previous: Junio C HamanoNext: Martin Langhoff
Message 3 of 4 in “Re: cg-merge should use git-merge”
  1. Junio C HamanoOct 17, 2005
  2. Junio C HamanoOct 17, 2005
  3. Fwd: cg-merge should use git-mergeMartin Langhoff, Oct 19, 2005
  4. Martin LanghoffOct 20, 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.