Re: rebase converts merge commits
flat view
From: Kevin Ballard <hidden>
Date: 2016-06-15 22:49:46
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