Technical Analysis of Undoing Local Commits and Unstaging Files in Git

Fundamental Principles of Git Commit Undo

In the Git version control system, undoing local commits is a common operational requirement. When developers execute git add <foo.java> and git commit -m "add the foo.java file" commands, if they wish to undo this commit and restore files to an unstaged state, specific Git commands are required.

Detailed Explanation of Soft Reset Operation

Using the git reset --soft HEAD~1 command effectively undoes the most recent commit. The working principle of this command is:

• Move the HEAD pointer to the previous commit (HEAD~1)
• Preserve all modifications in the working directory
• Retain changes from the undone commit in the staging area

After executing this command, changes in the staging area can be viewed with git diff --cached, and git status will display:

# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   foo.java
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   foo.java
#

Alternative Mixed Reset Approach

In addition to soft reset, the git reset HEAD^ command can be used, which is the default mixed reset mode. The main differences between mixed reset and soft reset are:

• Mixed reset moves changes from the undone commit to the working directory instead of the staging area
• Files remain unstaged and require re-execution of git add for commitment
• Suitable for scenarios requiring reorganization of commit content

Commit Amendment Techniques

The reference article mentions usage scenarios for git commit --amend, primarily for:

• Fixing typos in commit messages
• Adding missed files to the most recent commit

Workflow for adding files:

1. Use git add . to add all unstaged files, or git add path/to/file.html for specific files
2. Execute git commit --amend to amend the commit

Complex File Removal Scenarios

When files need to be removed from an already committed state, the operation process is more complex:

1. Use git reset --soft HEAD~1 to undo the commit, returning files to the staging area
2. Use git reset HEAD path/to/file.html to remove unwanted files from the staging area
3. Execute git commit -c ORIG_HEAD to recommit, preserving the original commit message

Practical Recommendations and Considerations

In actual development, it is recommended to:

• Ensure working directory changes are saved before undoing commits
• Understand the impact of different reset modes on working directory, staging area, and commit history
• Avoid using reset operations for commits already pushed to remote repositories
• Master git status and git diff commands to verify operation results