How to Delete the Last Commit in Git?

Whether you’ve accidentally committed the wrong code, or simply need to revise the last commit in your Git history, knowing how to delete the last commit in Git is essential. In this blog, we’ll explore several ways to remove or modify the most recent commit from your Git history, including both local and remote repositories.

---

Why Delete the Last Commit?

Deleting the last commit can be useful in several scenarios:

1. Accidental Commit: You committed files that weren’t ready or meant for the repository.
2. Commit Message Error: The commit message was incorrect or unclear.
3. Incorrect Code or Changes: You need to update the code or configuration in the last commit.
4. Removing Sensitive Data: You accidentally committed sensitive data, like API keys or passwords.

Each of these situations can be resolved by removing the last commit. Let’s cover the different methods you can use, depending on your specific needs.

---

Method 1: Deleting the Last Commit Locally (Soft Reset)

If you want to remove the last commit from your local branch but keep the changes in your working directory, you can use a soft reset.

Steps:

1. Run the git reset --soft HEAD~1 Command:

   git reset --soft HEAD~1

• HEAD~1 indicates the last commit in the history.
• The --soft flag keeps all changes from the last commit staged, allowing you to make additional modifications or commit again with a new message.

1. Make Edits or Recommit: After the soft reset, your files are staged, ready for further changes. When ready, you can re-commit the changes with:

   git commit -m "Updated commit message or corrected code"

This approach is best when you just need to update or modify the content or message of your last commit before pushing to a remote branch.

---

Method 2: Deleting the Last Commit Locally (Hard Reset)

If you want to delete the last commit and all associated changes without keeping them staged or in the working directory, a hard reset is the solution.

Steps:

1. Run the git reset --hard HEAD~1 Command:

   git reset --hard HEAD~1

This command will remove the last commit along with any associated changes. Be cautious when using this option, as it deletes all uncommitted changes.

2. Verify the Change: After a hard reset, you can check the commit history using git log to ensure the last commit was successfully removed.

A hard reset is ideal when you want to completely discard the last commit’s changes, with no intention of keeping them staged or tracked in any way.

---

Method 3: Amending the Last Commit

If you just want to modify the last commit’s message or add/remove files without deleting it entirely, you can use the --amend option.

Steps:

1. Make Changes (Optional): Update the files you want to modify, or leave them as-is if you only need to change the commit message.
2. Run the Amend Command:

   git commit --amend

• This command will open your default editor, allowing you to update the commit message.
• If you modified any files, the changes will be included in the amended commit.

1. Save and Exit: Save your changes and close the editor to complete the amended commit.

Amending the last commit is a helpful method when you need minor adjustments without removing the commit from history.

---

Deleting the Last Commit in a Remote Repository

If you’ve already pushed your last commit to a remote branch and need to delete or modify it, you’ll need to use a force push. Use caution, as this can rewrite history and affect collaborators.

Steps:

1. Delete the Last Commit Locally: Use one of the local deletion methods above to remove the last commit.

   git reset --soft HEAD~1

2. Force Push to Remote:

   git push origin <branch-name> --force

Replace <branch-name> with the name of your branch (e.g., main or develop).

Force-pushing rewrites the remote history, effectively deleting the last commit. Only use this in a shared repository if you’re certain that others are aware, as it will change the commit history for everyone.

---

Using reflog to Recover a Deleted Commit

If you accidentally delete a commit, Git’s reflog can help recover it, as it stores a history of changes to your branch.

1. Check the Reflog:

   git reflog

Reflog will display recent actions, including resets, along with commit hashes.

2. Recover the Commit: Identify the hash of the deleted commit, then check it out or create a new branch from it:

   git checkout <commit-hash>

Or, to restore the deleted commit to the current branch:

   git cherry-pick <commit-hash>

---

Summary

Deleting the last commit in Git can be done safely and efficiently using methods like git reset, --amend, and force pushing. Here’s a recap of the methods discussed:

1. Soft Reset: Deletes the last commit but keeps changes staged for recommit.
2. Hard Reset: Deletes the last commit and all changes permanently.
3. Amend: Modifies the last commit without deleting it.
4. Force Push: Removes the last commit in remote branches after modifying it locally.

With these options, you can manage and edit Git commit history confidently. Just remember that when working with shared repositories, always communicate any changes that rewrite history. Git’s flexibility ensures that you can maintain a clean and accurate history, optimizing your workflow for future development.