Question

Possible Duplicate:
How can I remove a commit on github?
How to delete a 'git commit'

So I’m trying to remove a commit from github.

It is 3 commits ago and I’m ok if all the changes are lost.

So based on questions from here, I did a

git reset --hard <sha-commit-name-to-go-back-to>
git push -f origin HEAD^:master

Now it is gone from github as well as in git log.

I then redid my changes and did

git add <file I changed>
git commit
git log

Everything looks fine. There’s no trace of the old commits. So I finally did a:

git push

Now suddenly github has those three commits that I had removed.

What am I doing wrong? How to I keep the commits from returning?

Answer 1

Use git rebase process before applying new changes. After rebasing add the new changes and commit.

git rebase -i HEAD~2

git push origin +master