When you spend a lot of time using git, you forget how careful you have to be with the git commits. Even if you are a beginner or an expert, I’m sure almost everyone has made changes to a local git repository and committed some changes and files that you didn’t want to commit.
Don’t worry, it happens to the best of us. In this post, you will learn how to undo those changes.
How to undo if you haven’t run git push
If you have not run git push so that the changes were only committed to your local Git repository. That means there are a few solutions.
Let’s say that you made some changes and you committed the changes:
git commit -m "Committing the wrong changes"
After that, if you run git log you will see the history of everything that has been committed to a repository.
To undo the last commit, you just need to run the following command:
git reset --soft HEAD~1
The command above will reset back with 1 point. This means that it will undo your commit but it will keep your code changes.
So if you would like to get rid of the changes as well you just need to do a hard reset. In order to do a hard reset run the command below:
git reset --hard HEAD~1
After you have done this, make your new changes.
Once you are done with the changes run git add. This will add any of the files that you would like to be included in the next commit.
git add .
Then use the git commit command as normal to commit your new changes.
git commit -m "Your new commit message"
After that it’s always a good thing to check your history again by running:
git log
Another approach would be to use git revert COMMIT_ID instead.
Conclusion
Mistakes happen to everybody, so it’s a good thing to know how to fix your mistakes. Remembering the things in this post will be very helpful and will make your life much easier.
Question
