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

Re: git rebase and merge commits

From
Joshua Jensen <jjensen@workspacewhiz.com>
Date
Oct 20, 2010, 17:44 UTC
Message-ID
<4CBF2A94.1030206@workspacewhiz.com>
In-Reply-To
<20101020173201.GA10537@burratino>
----- Original Message -----
From: Jonathan Nieder
Date: 10/20/2010 11:32 AM
Show 11 quoted lines
> I'm sorry to break this news, but "rebase --interactive --preserve-merges"
> (unlike "rebase --preserve-merges" without --interactive) was never
> implemented completely.  See the BUGS section of the git-rebase man page.
>
> Luckily, there is a roadmap for anyone interested in implementing it.  Maybe
> it could be you?  See [1] and the surrounding thread.
>
> Thanks for your interest,
> Jonathan
>
> [1] http://thread.gmane.org/gmane.comp.version-control.git/148059/focus=148144

I applied that patch to my git-rebase--interactive, although it did not cleanly apply. I hacked a few bits to get it going again. I could post the entire file here, if someone wants to clean it up.

It does properly rebase the first-parent merges fine.
Josh
Previous: Jonathan NiederNext: Joshua Jensen
Message 3 of 5 in “git rebase and merge commits”
  1. Dominique QuatravauxOct 20, 2010
  2. Jonathan NiederOct 20, 2010
  3. Joshua JensenOct 20, 2010
  4. Joshua JensenOct 20, 2010
  5. Dominique QuatravauxOct 25, 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.