How to Delete the Last Commit in Git?

In software development, there are times when you need to delete or undo the last commit in your Git repository. This could be due to an error, an incomplete change, or the need to adjust your commit history. Understanding how to safely delete the last commit ensures you maintain a clean and organized repository.

In this blog, we’ll explore how to delete the last commit in Git, the scenarios in which each method is appropriate, and best practices for managing your Git history.

Why Delete the Last Commit?

Deleting the last commit is useful when:

• The commit contains mistakes.
• The changes don’t belong in the repository.
• You want to adjust the commit before sharing it.
• You accidentally pushed the wrong changes to a remote repository.

---

Step-by-Step Guide to Deleting the Last Commit

1. Identify the State of Your Commit

Before proceeding, it’s important to understand the state of the commit you want to delete:

• Unpushed Commit: The commit has not been pushed to a remote repository.
• Pushed Commit: The commit has already been pushed and may have been pulled by others.

---

2. Undo an Unpushed Commit

If the commit has not been pushed to a remote repository, you can safely remove it using the following commands:

Option 1: Using git reset

This method removes the commit from the history while keeping the changes in your working directory:

git reset --soft HEAD~1  

• HEAD~1: Refers to the last commit.
• --soft: Keeps the changes staged for the next commit.

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

git reset --mixed HEAD~1  

To remove the commit and discard the changes entirely:

git reset --hard HEAD~1  

Warning: Use --hard with caution as it will permanently delete uncommitted changes.

Option 2: Using git restore --staged

If you want to unstage all files after deleting the commit:

git reset HEAD~1  
git restore --staged .  

---

3. Undo a Pushed Commit

If the commit has already been pushed to the remote repository, deleting it requires extra steps to ensure consistency.

Option 1: Use git reset and Force Push

1. Reset the commit locally: git reset --hard HEAD~1
2. Force-push the changes to the remote repository: git push origin branch-name --force

Note: Force-pushing can overwrite changes on the remote repository. Ensure no other team members have made changes to the same branch before proceeding.

Option 2: Revert the Commit

Reverting is a safer alternative that creates a new commit to undo the effects of the last commit without altering history:

git revert HEAD  

This approach is ideal for collaborative projects as it preserves the integrity of the commit history.

---

Best Practices for Deleting Commits

1. Communicate with Your Team: If the commit has been pushed, inform your team before making changes to the history.
2. Use git revert for Shared Branches: Avoid rewriting history on shared branches; use git revert to maintain transparency.
3. Double-Check Before Using --hard: Be cautious when using git reset --hard as it permanently deletes changes.
4. Backup Your Work: Before making major changes to your repository, create a backup branch: git branch backup-branch

---

Common Scenarios and Solutions

Scenario 1: Undo a Commit Without Losing Changes

Use:

git reset --soft HEAD~1  

Scenario 2: Undo a Commit and Start Fresh

Use:

git reset --hard HEAD~1  

Scenario 3: Undo a Commit Already Pushed

Use:

git reset --hard HEAD~1  
git push origin branch-name --force  

Or:

git revert HEAD  

Scenario 4: Stuck After Resetting or Reverting

Use:

git reflog  

This lists all recent actions, allowing you to restore the deleted commit if needed.

---

Conclusion

Deleting the last commit in Git is a common task, but it should be done with care to avoid disrupting your workflow or affecting collaborators. By understanding the differences between unpushed and pushed commits, and using the appropriate commands, you can efficiently manage your Git history while minimizing risk.

Whether you’re undoing a mistake or adjusting your commit history, the techniques covered in this guide will help you stay in control of your repository.