Background: I recently merged a rather large topic branch into
master. A couple of days later I discovered this topic branch contained bugs. So I
git revert -m 1 <merge-commit>ed it.
Problem: Now I'd like to check out the topic branch and rebase it against current
master so that I can 1) fix the bugs and 2) (again) merge the fixed up topic branch with master. Creating the new branch,
fixedtopic is the easy part, but every time I do
git checkout fixedtopic git rebase master
git decides that it's not willing to replay the old commits since they are already merged into
master. Instead it simply does a fast-forward rebase.
Question: How can force replay of the commits onto
rebase? Can I? I'd rather not use
cherry-pick since it's a bit more cumbersome.
git reseting the merge commit it not an option, since I have pushed the master upstream.
- I'd rather not create a new branch off of
masterand revert my revert. The reason for this is that I'd like to rewrite some of the topic branch's history using interactive rebase.
- Here's a github gist of the scenario: https://gist.github.com/JensRantil/6352495 Note that I'd like e8df5ec and ee16464 applied onto
master(or branch based on