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

Re: rebase converts merge commits

From
Kevin Ballard <kevin@sb.org>
Date
Oct 12, 2010, 20:27 UTC
Message-ID
<523A21BF-F6A1-4BF2-8385-941B61BA769F@sb.org>
In-Reply-To
<AANLkTikz0yUv9+EcT-kVwniUf9xnRe=_y96euNb=stzP@mail.gmail.com>
On Oct 12, 2010, at 7:55 AM, Sébastien Barthélemy wrote:
> By the way, if there is a way to do what I want, please tell me.
Your history is short enough that if you can't get rebase to do what you want, you could always do it by hand. Create a temp branch to work on based on the bad commit, cherry-pick the good commit with --no-commit, then amend the bad commit. Then just cherry-pick each subsequent commit until you get to the merge. Re-perform the merge. Then just continue to cherry-pick subsequent commits. It's not ideal, but it should work.
-Kevin Ballard
Previous: Sébastien BarthélemyNext: Sébastien Barthélemy
Message 4 of 5 in “rebase converts merge commits”
  1. Sébastien BarthélemyOct 12, 2010
  2. Matthijs KooijmanOct 12, 2010
  3. Sébastien BarthélemyOct 12, 2010
  4. Kevin BallardOct 12, 2010
  5. Sébastien BarthélemyOct 17, 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.