How can I undo a `git commit` locally and on a remote after `git push`

by 
git reset --hard HEAD~1
git push -f <remote> <branch>

(Example push: git push -f origin bugfix/bug123)

This will undo the last commit and push the updated history to the remote. You need to pass the -f because you’re replacing upstream history in the remote.

Edit:

Please note that --hard will make your commit unreachable (i.e. it will appear to be deleted, but you can still git show <hash> or git log <hash> it if you remember its hash). If you want to keep your changes, run:

git reset [--mixed] HEAD~1

At this point you have unstaged changes because you used --mixed, which is the default.

You may first want to update the remote tree first (i.e. remove the commit): git push -f <remote> <branch>

Since you still have your changes locally you can create another branch and commit them there (and push as you see fit).

More Related Contents:

  1. How can I recover from an erronous git push -f origin master?
  2. What are the differences between “git commit” and “git push”?
  3. Is there a way to cache https credentials for pushing commits?
  4. Remove sensitive files and their commits from Git history
  5. How do I properly force a Git push?
  6. Undoing a ‘git push’
  7. How do I resolve git saying “Commit your changes or stash them before you can merge”?
  8. Removing multiple files from a Git repo that have already been deleted from disk
  9. How to push to a non-bare Git repository?
  10. git push –force-with-lease vs. –force
  11. Can’t push to GitHub because of large file which I already deleted
  12. How to reference the initial commit?
  13. Skip Git commit hooks
  14. Recover files that were added to the index but then removed by a git reset
  15. ! [rejected] master -> master (fetch first)
  16. How do I commit only some files?
  17. Removing multiple files from a Git repo that have already been deleted from disk
  18. Heroku: How to push different local Git branches to Heroku/master
  19. Commit only part of a file’s changes in Git
  20. How can I change the default comments in the git commit message?
  21. What does ‘–set-upstream’ do?
  22. How can I revert uncommitted changes including files and folders?
  23. Making a Git push from a detached head
  24. Pushing from local repository to GitHub hosted remote
  25. git push heroku master says “Everything up-to-date”, but the app is not current
  26. How to see commits that were merged in to a merge commit?
  27. Remove a git commit which has not been pushed
  28. Xcode 9 commit: Couldn’t communicate with helper application
  29. Why does ‘git commit’ not save my changes?
  30. Is it possible to set a git commit to have a timestamp prior to 1970?

Leave a Comment