How can I rollback a git repository to a specific commit?

Question

My repo has 100 commits in it right now. I need to rollback the repository to commit 80, and remove all the subsequent ones.

Why?

This repo is supposed to be for merging from miscellaneous users. A bunch of merges went in as commits from me, due to excessive editing. That was due to a mislabeling of my remote branches, where 3 developers were labeled as each other. I need to reset to that point, and then pull forwards.

I wanted to rebase, as in this example: How can I remove a commit on GitHub?

However, git wants me to do a lot of conflict management. Is there a simpler way?

Answer 1

git reset --hard <old-commit-id> git push -f <remote-name> <branch-name> 

Note: As written in comments below, Using this is dangerous in a collaborative environment: you're rewriting history

Answer 2

To undo the most recent commit I do this:

First:

git log 

get the very latest SHA id to undo.

git revert SHA 

That will create a new commit that does the exact opposite of your commit. Then you can push this new commit to bring your app to the state it was before, and your git history will show these changes accordingly.

This is good for an immediate redo of something you just committed, which I find is more often the case for me.

As Mike metioned, you can also do this:

git revert HEAD