Undo a particular commit in Git that's been pushed to remote repos
What is the simplest way to undo a particular commit that is:
not in the head or HEAD
Has been pushed to the remote.
Because if it is not the latest commit,
git reset HEAD
doesn't work. And because it has been pushed to a remote,
git rebase -i
and
git rebase --onto
will cause some problem in the remotes.
More so, I don't want to modify the history really. If there was bad code, it was there in the history and can be seen. I just want it out in the working copy, and I don't mind a reverse merge commit.
In other words, what is the Git equivalent of the following svn commands:
svn merge -r 303:295 http://svn.example.com/repos/calc/trunk
which removes all changes from 295 to 302 by reverse merging all changes in those revisions, as a new commit.
svn merge -c -302 ^/trunk
which undoes the 302 commit, of course by adding another commit that reverse merges the changes from that respective commit.
I thought it should be a fairly simple operation in Git and a fairly common use case. What else is the point of atomic commits?
We have staging stashing and all to ensure the commits are perfectly atomic, shouldn't you be able to undo one or more of those atomic commits easily?
Identify the hash of the commit, using git log, then use git revert <commit> to create a new commit that removes these changes. In a way, git revert is the converse of git cherry-pick -- the latter applies the patch to a branch that's missing it, the former removes it from a branch that has it.
I don't like the auto-commit that git revert does, so this might be helpful for some.
If you just want the modified files not the auto-commit, you can use --no-commit
% git revert --no-commit <commit hash>
which is the same as the -n
% git revert -n <commit hash>
git reset HEAD~1 --soft if you already reverted without -n
git reset HEAD~n won't solve undoing of any commit not continuously reachable from the head. The query is to revert any particular commit.
git revert --continue as it instructed me. It worked, but sadly committed the results. Perhaps I needed to do git revert --no-commit --continue.
git revert, if you forgot the -n; because at that point the last commit is the reversion, so the soft reset will undo that commit but not the associated code changes of the revert
Because it has already been pushed, you shouldn't directly manipulate history. git revert will revert specific changes from a commit using a new commit, so as to not manipulate commit history.
If the commit you want to revert is a merged commit (has been merged already), then you should either -m 1 or -m 2 option as shown below. This will let git know which parent commit of the merged commit to use. More details can be found HERE.
git revert
git revert
Follow WeChat
Success story sharing
Want to stay one step ahead of the latest teleworks?
Subscribe Now相似问题
- How do I undo 'git add' before commit?
- How to undo "git commit --amend" done instead of "git commit"
- How can I revert multiple Git commits?
- Move the most recent commit(s) to a new branch with Git
- How do I check out a remote Git branch?
- Undo a Git merge that hasn't been pushed yet
- How to change the URI (URL) for a remote Git repository?
- How do I revert a Git repository to a previous commit?
- How can I reconcile detached HEAD with master/origin?
