How to Undo the Last Commit in Git?

Git is an incredibly powerful version control system, but it’s easy to make mistakes—like committing changes prematurely or including the wrong files.

Fortunately, Git provides robust tools to undo your last commit safely and effectively. This blog explains various approaches to undoing the last commit in Git, catering to different scenarios.

Understanding the Basics of Undoing Commits

When you commit in Git, two key things happen:

1. Commit Object Created: Git saves the state of the changes in your local repository.
2. Branch Pointer Update: The branch pointer advances to the new commit.

Undoing a commit involves managing these actions without losing important data. Git makes this possible through commands like git reset, git revert, and git commit --amend.

---

Scenarios and Solutions

1. Undo the Last Commit but Keep Changes in the Working Directory

If you want to undo the commit but retain the changes in your working directory, use the git reset command:

git reset --soft HEAD~1

Explanation:

• HEAD~1: Refers to the commit before the most recent one.
• --soft: Removes the commit but leaves the changes staged (ready to be re-committed).

This is useful if you want to modify your commit message or add more changes before committing again.

---

2. Undo the Last Commit and Remove Changes from the Staging Area

If you want to undo the commit and unstage the changes, use:

git reset --mixed HEAD~1

Explanation:

• --mixed: Removes the commit and unstages the changes, leaving them in your working directory.

You can review or edit the files before committing again.

---

3. Undo the Last Commit and Discard Changes

To completely undo the last commit and discard all associated changes, use:

git reset --hard HEAD~1

Warning:

• This action removes all changes in the last commit from both the working directory and the repository.
• Ensure you’ve backed up important work before using --hard.

---

4. Undo the Last Commit Without Affecting Local Changes

If the commit has already been pushed to a shared branch, it’s safer to use git revert instead of git reset. This creates a new commit that undoes the changes introduced in the last commit:

git revert HEAD

Explanation:

• git revert: Generates a new commit that negates the effects of the previous one.
• This is ideal for collaborative workflows as it preserves history and avoids altering shared commits.

---

5. Modify the Last Commit

If you simply want to change the last commit message or add/remove files, you can amend the commit:

git commit --amend

Scenarios for git commit --amend:

• Editing the Commit Message: Run the command without staging additional changes, and Git will prompt you to edit the message.
• Adding More Changes: Stage the new changes (git add) before running the command.

---

Best Practices for Undoing Commits

1. Use git revert for Shared Branches: Avoid using git reset on branches that others are working on; it rewrites history and can cause conflicts.
2. Double-Check Before Using --hard: Ensure you’re ready to lose uncommitted changes when using git reset --hard.
3. Commit Frequently: Smaller, more frequent commits reduce the impact of needing to undo changes.
4. Leverage git log: Use git log to inspect recent commits and verify the state of your repository before undoing any commit.

---

Practical Examples

Example 1: Accidentally Committed Too Early

You committed changes before adding a critical file:

git reset --soft HEAD~1
git add important-file.txt
git commit -m "Include important file in the commit"

Example 2: Push a Fix to the Last Commit

You realized a typo in your last commit message after pushing it:

git commit --amend -m "Corrected commit message"
git push --force

(Use --force with caution on shared branches.)

---

Conclusion

Undoing a commit in Git is a common task that, when approached correctly, can be seamless and safe. Whether you’re working locally or in a shared repository, Git provides flexible options to manage mistakes without disrupting your workflow. By understanding and applying the appropriate commands, you can maintain a clean and organized project history.