How to undo the last commit in git

git git-commit git-reset git-revert
chintan s picture chintan s · May 24, 2016 · Viewed 225.1k times · Source

By mistake, I did git add . and git commit in the develop branch. But luckily, I did not do git push.

So I wanted to revert it back to original state.

I tried git reset --soft and git reset HEAD --hard but looks like I have messed it up.

How do I fix this? I want to go back to original state and possibly keep the code changes.

Answer

guessimtoolate picture guessimtoolate · May 24, 2016

I think you haven't messed up yet. Try:

git reset HEAD^

This will bring the dir to state before you've made the commit, HEAD^ means the parent of the current commit (the one you don't want anymore), while keeping changes from it (unstaged).

Related questions

How to revert uncommitted changes including files and folders?

Is there a git command to revert all uncommitted changes in a working tree and index and to also remove newly created files and folders?

Read More
Reset all changes after last commit in git

How can I undo every change made to my directory after the last commit, including deleting added files, resetting modified files, and adding back deleted files?

Read More
How to cancel a local git commit

My issue is I have changed a file eg: README, added a new line 'this for my testing line' and saved the file, then I issued the following commands git status # On branch master # Changed but not updated: # (use "git …

Read More