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

Re: rebasing a merge

From
Jay Soffian <jaysoffian@gmail.com>
Date
Jun 24, 2010, 14:22 UTC
Message-ID
<AANLkTik5PteeUzGvElMTiTiFf64s4KFEyoTAq_f8wLAf@mail.gmail.com>
In-Reply-To
<alpine.DEB.2.00.1006241012400.28950@ds9.cixit.se>
On Thu, Jun 24, 2010 at 5:16 AM, Peter Krefting <peter@softwolves.pp.se> wrote:
> You could probably get off by "git cat-file" the commit object, changing the
> parent reference to point to the newly introduced commit while leaving the
> rest intact, and then "git hash-object" the new commit object, and then
> forward the branch head to that one.
Did you miss my followup message?
http://article.gmane.org/gmane.comp.version-control.git/149335
j.
Previous: Peter Krefting
Message 6 of 6 in “rebasing a merge”
  1. Jay SoffianJun 17, 2010
  2. Jay SoffianJun 18, 2010
  3. Peter KreftingJun 18, 2010
  4. Jay SoffianJun 18, 2010
  5. Peter KreftingJun 24, 2010
  6. Jay SoffianJun 24, 2010

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.