How to Delete Last Commit in Git?

Git, the popular version control system, provides rich tools for managing changes in your codebase. Sometimes, you may need to delete the last commit due to an error, unnecessary changes, or other reasons. In this article, we will walk you through the steps to safely delete the last commit in Git, whether the commit has been pushed to a remote repository or not.

Deleting the last commit in Git can mean different things depending on your specific needs:

• Amending the Last Commit: Fixing or modifying the last commit without changing its overall identity.
• Reverting the Last Commit: Creating a new commit that undoes the changes introduced by the previous commit.
• Resetting to a Previous State: Completely removing the last commit from the history.

Using `git reset`

The `git reset` command is a powerful tool that allows you to move the HEAD pointer and optionally modify the index and working directory. To delete the last commit, you typically use the `–hard` or `–soft` options.

Example: Using `–hard` Reset

This option resets the HEAD to the previous commit and discards all changes in the working directory and index.

git reset --hard HEAD~1

This command moves the HEAD to the commit before the last one and removes all changes introduced by the last commit from the working directory and staging area.

Example: Using `–soft` Reset

This option resets the HEAD to the previous commit but keeps the changes in the staging area.

git reset --soft HEAD~1

This command moves the HEAD to the commit before the last one but retains the changes introduced by the last commit in the index (staging area), allowing you to make additional modifications before committing again.

Using `git revert`

If you want to keep a record of the changes but negate the effects of the last commit, you can use the `git revert` command. This creates a new commit that reverses the changes introduced by the last commit.

git revert HEAD

This command generates a new commit that undoes the changes of the last commit, preserving the history of changes.

If the last commit has already been pushed to a remote repository, you need to be more cautious. Changing the commit history in a remote repository can affect other collaborators. Ensure that you communicate with your team before making such changes.

Using `git reset` and Force Push

You can use `git reset` to move the HEAD to the previous commit and then force push the changes to the remote repository.

Example: Force Pushing After `–hard` Reset

git reset --hard HEAD~1
git push origin main --force

This command sequence resets the HEAD locally and then force pushes the updated history to the remote repository, effectively deleting the last commit.

Using `git revert` and Push

To avoid rewriting history, use `git revert` followed by a regular push. This method is safer for shared repositories.

git revert HEAD
git push origin main

This command sequence creates a new commit that negates the last commit and then pushes the changes to the remote repository.

Communicate with Your Team

When working in a team, always communicate with your colleagues before making changes to the commit history. This helps avoid confusion and conflicts.

Use Branches

Perform risky operations on a separate branch before applying them to the main branch. This allows you to verify the changes without affecting the primary workflow.

Backup Your Work

Before performing any destructive operations, ensure you have a backup of your work. You can create a temporary branch pointing to the current state:

git branch backup-branch

Understand the Impact

Force pushing can overwrite history and potentially disrupt the work of others. Use it with caution and understand its impact.

Deleting the last commit in Git is a common task that can be achieved through various methods depending on your needs. Whether you choose to reset, revert, or amend, understanding these techniques helps you maintain a clean and accurate commit history. Always exercise caution, especially when dealing with remote repositories, and communicate with your team to ensure a smooth workflow.