How to Fix Mistaken Git Commits: Amend, Reset, and Revert Explained

1. Introduction

Everyone makes mistakes when coding; you may accidentally commit the wrong code or write a poor commit message. This article explains how to fix such Git commit errors.

2. What to Do When a Commit Is Wrong

Scenario 1

If you have already run git commit but the commit message is unsatisfactory, you can amend it:

git commit --amend -m "New commit message"

Scenario 2

You committed four files instead of the intended five. Use git commit --amend to add the missing file without creating a new commit:

git add forgotten_file
git commit --amend --no-edit

Scenario 3

When the author information is incorrect, amend the commit with the proper author:

git commit --amend --author "felord<[email protected]>"

Prefer fixing these errors locally before pushing. The amend command rewrites history and can make the log confusing; git commit -am is not a shortcut for git commit --amend .

Scenario 4

To undo the most recent commit (local or remote), use git reset. For example, to move the latest commit back to the previous one:

git reset --soft 8e7089f62ad8588f5710f23d6a8ce1158490032b

git reset

supports four modes: soft, mixed, hard, and keep.

The git revert command also creates a new commit that undoes changes, but unlike git reset it requires a commit message.

Scenario 5

If the changes have already been pushed and you need to revert a specific file, view its history, check out the desired commit for that file, and recommit:

# View file history
git log <filename>
# Roll back to a specific commit
git checkout <commitId> <filename>
# Commit the reverted file
git commit -m 'Revert specific file changes'
# Push the fix
git push

3. Summary

These commands are essential for correcting commit mistakes. Use a new branch to experiment before rewriting history, and become familiar with amend, reset, and revert to maintain a clean Git history.