Question

I wanted to squash my last 2 commits into one, so did a git rebase, in following way:

git rebase -i HEAD~2

but due to a typo, what I actually ended up pushing into origin was:

git rebase -i HEAD-3

Now, in the Github Pull Request it shows commit of some other unrelated commit. so basically, I want to remove commit 06674f0 which isn’t mine, while keeping fcea5e0 in this PR.

how to fix the mess caused by simple typo?

Answer 1

Edit: Check your reflog with

git reflog

Pick the commit previous to your first rebase and replace the x with appropriate number below:

Just undo your last rebase and redo it:

git reset --hard HEAD@{x}
git rebase -i HEAD~2
..
git push -f origin master

Remove your pull request and issue a new one.