Earlier on, I committed some code which at the time seemed like a good idea, but in fact it made things worse. I'd like to remove the change from the history as it is not helpful, and rebase all commits since - they should all merge without issues.
I tried creating a new branch (called newMaster
) immediately before the bad commit (with gitx), checking it out and running:
git rebase -i master
Which AFAICS should have given me a list of the commits on master and the option to merge or not merge them, but instead it said noop, and fast forwarded newMaster to be equal to master.
What is the easiest way to do what I need?