How to Delete a Commit in Git?

Managing commits in Git is a critical skill for maintaining a clean and organized version history. Whether you need to remove an erroneous commit or rewrite your commit history, Git provides tools to help.

This blog walks you through the process of deleting commits safely and effectively.

Why Delete a Commit?

Deleting a commit may be necessary in several scenarios:

1. Remove Sensitive Information: Erase accidentally committed sensitive data, such as passwords or API keys.
2. Fix Mistakes: Remove erroneous changes that disrupt the repository’s functionality.
3. Clean Up History: Streamline the commit history for better readability.

Prerequisites

Before proceeding, ensure you have:

• Git installed on your system.
• A backup or clone of your repository (recommended to avoid accidental data loss).
• A clear understanding of your branch’s current state.

Methods to Delete a Commit

Below are the most common methods to delete a commit, tailored for different scenarios.

---

1. Undo the Last Commit

If the commit you want to delete is the most recent one, you can use the git reset command.

Option 1: Keep Changes in Your Working Directory

To remove the commit but keep the changes in your working directory:

git reset --soft HEAD~1

• HEAD~1 refers to the last commit.
• The changes will remain staged for a new commit.

Option 2: Discard Changes Entirely

To delete the last commit and discard its changes:

git reset --hard HEAD~1

Warning: This action is irreversible, so ensure you want to permanently delete the changes.

---

2. Remove a Specific Commit

If the commit is not the latest one, you can use the git rebase command.

Step 1: Start an Interactive Rebase

Run the following command to rebase your branch interactively:

git rebase -i HEAD~N

Replace N with the number of commits you want to review, including the one you want to delete.

Step 2: Mark the Commit for Deletion

In the text editor that opens, you’ll see a list of commits:

pick <commit-hash> Commit message

• Change pick to drop for the commit you want to delete.
• Save and close the editor.

Git will reapply the remaining commits and exclude the one marked for deletion.

---

3. Use git revert (Non-Destructive Method)

If you’ve already pushed the commit to a shared branch and want to undo its effects without altering the history, use git revert:

git revert <commit-hash>

This creates a new commit that negates the changes introduced by the specified commit. It’s ideal for shared repositories to preserve history integrity.

---

Handling Pushed Commits

If the commit has been pushed to a remote repository, you’ll need to force-push after making local changes. Caution: Force-pushing can overwrite changes made by others.

git push origin branch-name --force

Coordinate with your team before force-pushing to avoid disrupting collaborative workflows.

---

Best Practices

1. Backup Your Work: Always create a backup or branch before modifying commit history.
2. Communicate with Your Team: Notify team members when rewriting history, especially on shared branches.
3. Use Revert for Shared Branches: Prefer git revert over destructive commands to maintain transparency.

Conclusion

Deleting a commit in Git can be straightforward when done carefully. Whether you’re cleaning up local commits or fixing errors in a shared repository, understanding the right method ensures a smooth and effective workflow. By following this guide, you’ll be well-equipped to manage your Git history with confidence.