How to Delete a Local Commit in Git?

Git is a powerful version control system, but mistakes can happen—such as an unwanted commit to your local repository. Whether it’s a typo in the commit message, staging the wrong files, or realizing the commit shouldn’t exist, Git provides multiple ways to delete or undo a local commit.

In this blog, we’ll walk you through how to delete a local commit safely and efficiently.

When to Delete a Local Commit?

Deleting a local commit might be necessary in the following situations:

• Wrong files were committed: You accidentally staged unnecessary or incorrect files.
• Commit message needs changes: The message doesn’t describe the changes accurately.
• You want to reorder commits: You need to adjust the sequence of commits in your branch.
• Undo recent changes: You want to completely remove the effects of the commit.

---

Prerequisites

1. A basic understanding of Git and its commands.
2. Ensure the commit in question is not pushed to a remote repository. If it has been pushed, refer to the section on handling pushed commits.

---

Step 1: View Your Commit History

To identify the commit you want to delete, start by viewing your branch’s commit history:

git log --oneline  

This displays a concise history of commits with their unique hashes. For example:

a7b5c9d Add feature X  
9f7e6a8 Fix typo in README  
b3a1c2d Initial commit  

---

Step 2: Choose the Right Approach

There are two main ways to delete a local commit:

1. Undo the Last Commit (Amend or Reset)
2. Delete a Specific Commit in the History (Rebase)

---

Option 1: Undo the Last Commit

If you want to remove the most recent commit:

1. Keep the changes from the commit (soft reset):
   This method removes the commit but leaves your changes staged. git reset --soft HEAD~1
2. Unstage the changes but keep the files (mixed reset): git reset --mixed HEAD~1 This removes the commit and unstages the changes, but the modified files remain intact.
3. Discard the changes entirely (hard reset): git reset --hard HEAD~1 This deletes the commit and erases all associated changes. Be cautious, as this cannot be undone.

---

Option 2: Delete a Specific Commit in the History

If you need to delete a specific commit that is not the latest one, you’ll use an interactive rebase:

1. Start an interactive rebase for the last few commits: git rebase -i HEAD~<number-of-commits> Replace <number-of-commits> with the number of recent commits you want to view for editing. For example, to rebase the last 3 commits: git rebase -i HEAD~3
2. A text editor (like Vim or VS Code) will open with a list of commits: pick a7b5c9d Add feature X pick 9f7e6a8 Fix typo in README pick b3a1c2d Initial commit
3. Locate the commit you want to delete and change pick to drop: pick a7b5c9d Add feature X drop 9f7e6a8 Fix typo in README pick b3a1c2d Initial commit
4. Save and close the editor. Git will rewrite the commit history and remove the specified commit.

---

Handling Pushed Commits

If the commit has already been pushed to a remote repository, you must proceed with caution to avoid disrupting your team. You can use:

1. Revert the Commit:
   Create a new commit that undoes the changes introduced by the unwanted commit: git revert <commit-hash>
2. Force Push After Deleting (Not Recommended):
   After deleting the commit locally, force-push your branch: git push origin <branch-name> --force Use this only if you’re certain it won’t impact others working on the same branch.

---

Best Practices

1. Commit Thoughtfully: Review staged changes before committing with git status and git diff.
2. Avoid Force Push: Only force-push if absolutely necessary, and inform your team beforehand.
3. Backup Your Work: Before performing destructive operations, create a backup branch: git branch backup
4. Test Before Committing: Ensure your changes work as expected before committing.

---

Common Issues and Solutions

1. Accidentally Deleted the Wrong Commit

• Recover it using the commit hash (if it’s still in the reflog): git reflog git reset --hard <commit-hash>

2. Merge Conflicts After Rebase

• Resolve conflicts manually, stage the changes, and continue the rebase: git add <file> git rebase --continue

3. Reset Command Erased Changes

• If the reset used --hard and changes are lost, recovery might not be possible. Always confirm before using --hard.

---

Conclusion

Deleting a local commit in Git is straightforward when you understand the available options and their consequences.

By using git reset for recent commits or interactive rebase for specific commits, you can efficiently manage your repository’s commit history. Always proceed carefully, especially when working on branches shared with others, to avoid disrupting workflows.

With these tools and practices, you can confidently clean up your Git history while maintaining a smooth development process.