JIYIK CN >

While using Git, we come across various situations where we intentionally want to undo the last commit because we want to re-commit it extensively or even delete it completely due to a mistake we made in the past. Just imagine Undo Last Commithow many people would use Git if it had easy options and even the most popular keyboard shortcuts.

We have a simple yet powerful command, the same as discussed above. This command is so powerful because it discards the last commit and restores HEAD (the current branch) to the state it was in before the last commit was made in that repository. This can be a little confusing for new Git users, but once we get the hang of it, it becomes such a simple addition to our Git toolbox.

Undo last commit in Git (long version)

First, open the desired terminal, and run Git status. This will show us the status of our repository, including a list of all the commits we have made. Most of the time, it will say there are three commits.

The first is mastera commit to a branch called , which is our current branch in the repository. The second is Deva commit to a new branch called , and finally, the third is NewDeva commit to another branch called .

The last two are interesting, because they are what we want to undo. We want to discard the commits we made to Devand NewDev, and restore HEAD to the state it was in before those commits. Let's run the following command and see what happens afterwards:

$ git reset --hard 

HEAD is now in its previous state. As we can see, the new HEAD pointer is now back to the next commit. Note that there is no longer Deva commit labeled . Also, the NewDevcommit labeled is back to 下一个提交.

Undo last commit in Git (short version)

If we want to undo the last commit, make sure we are on the branch we want to undo the commit on, then run git reset --hard. If we want to undo the last commit on the current branch, make sure we are on master, then run the following command.

git reset --hard origin/master.  

The above procedure can be applied only when we are absolutely sure that these changes are no longer required. But on the other hand, if we need to keep these changes as uncommitted local changes in the working copy, then for this case, resetthe command is how we can solve this problem:

$ git reset --soft HEAD~1

resetwill undo our current HEAD branch to a specific point. In the example we mentioned above, we commanded to go back to the last commit before the most recent undo - advantageously creating our last unfinished commit. --softThe -p flag ensures that changes in the unfinished revision are reverted.