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

User · Answer

Another way    Checkout the branch you want to revert  then reset your local working copy back to the commit that you want to be the latest one on the remote server  everything after it will go bye-bye   To do this  in SourceTree  I right-clicked on the and selected  Reset BRANCHNAME to this commit     Then navigate to your repository s local directory and run this command    git -c diff mnemonicprefix false -c core quotepath false push -v -f -- tags REPOSITORY NAME BRANCHNAME BRANCHNAME    This will erase all commits after the current one in your local repository but only for that one branch

User · Answer

When doing branch updates from master  I notice that I sometimes over-click  and cause the branch to merge into the master  too   Found a way to undo that   If your last commit was a merge  a little more love is needed   git revert -m 1 HEAD

User · Answer

git reset --hard  lt old-commit-id gt  git push -f  lt remote-name gt   lt branch-name gt    Note  As written in comments below  Using this is dangerous in a collaborative environment  you re rewriting history

User · Answer

In github  the easy way is to delete the remote branch in the github UI  under branches tab  You have to make sure remove following settings to make the branch deletable    Not a default branch No opening poll requests  The branch is not protected    Now recreate it in your local repository to point to the previous commit point  and add it back to remote repo   git checkout -b master 734c2b9b     replace with your commit point   Then push the local branch to remote  git push -u origin master   Add back the default branch and branch protection  etc

User · Answer

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

User · Answer

Most suggestions are assuming that you need to somehow destroy the last 20 commits  which is why it means  rewriting history   but you don t have to   Just create a new branch from the commit  80 and work on that branch going forward  The other 20 commits will stay on the old orphaned branch   If you absolutely want your new branch to have the same name  remember that branch are basically just labels  Just rename your old branch to something else  then create the new branch at commit  80 with the name you want

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

Examples related to git

Examples related to github