git rebase -i HEAD~5 and pull request with not mine commits

Question

I just did git rebase -i HEAD~5, wanted to fixup/squash 2 of my commits... then had to force push and now my remote branch has one commit of mine and 4 of someone else. WTF. please help, how to remove the other 4 commits of someone's else?! I just want it to have that one commit of mine.

Answer 1

When you do a git rebase -i HEAD~5 you also get all the commits in a merge.
You had a merge commit so you had more commits that the actual 5 commits.

For example:
here is the log screenshot + the git rebase -i HEAD~5 which results in 17 commits.

You can follow the log and count the 5 commits on the most left branch and you will see that all the other commits are "collected" on the way as well.

Answer 2

设法返回git reflog并从那里修复它。