How to run git rebase interactive mode to remove duplicate commits

Question

I made a mistake when I rebase to a recent commit. ( I forgot to git fetch --all first, then rebase), and I\'ve committed and pushed to the remote branch since.

Answer 1

Give git rebase the number of commits back in time. For 10 commit back in history:

git rebase -i HEAD~10

Then simply delete the lines for the commits you want to remove in the text editor that is shown. Saving the file and exiting will start the rebase and the lines that were removed will no longer be in the history once the rebase has completed.

Answer 2

I successfully removed the duplicate commits. Here is what I did: hard reset to the branching point, pull from origin, start git rebase -i SHACODE (original branching point), pick the commits that I want to keep, git rebase to the current SHACODE.