Git Reset, Restore, and Revert

# CHAPTER 8

Git Reset, Restore, and Revert #

1. Introduction #

2. Learning Objectives #

• Use git restore to unstage files and discard local, uncommitted changes.

• Differentiate between git reset --soft, --mixed, and --hard.

• Understand how git reset fundamentally rewrites the branch pointer.

• Use git revert to safely undo a commit without rewriting history.

• Select the correct undo command based on whether the mistake is public or private.

3. Beginner-to-Advanced Explanations #

• git restore: Modifies the Working Directory and Staging Area. It says: "Put this specific file back exactly how it looked yesterday." It does NOT touch the commit graph.

• git reset: Modifies the Commit History (and optionally the other two). It says: "Take the entire branch pointer and rip it backward in time." It erases commits from existence.

• git revert: Modifies the Commit History safely. It says: "Read the bad commit, figure out the mathematical inverse of the code, and create a brand *new* commit moving forward that cancels out the mistake."

4. Git Command Walkthroughs #

The Safe Undo: git restore You are typing in app.js. You delete 50 lines of code by mistake and save the file. You haven't committed yet.

# Put app.js back exactly how it looked in the last commit
git restore app.js

# You accidentally typed `git add app.js` but you don't want to commit it yet!
# Pull it OUT of the staging area, back to the working directory
git restore --staged app.js

The Destructive Time Machine: git reset You committed three terrible, broken commits locally. You want them gone forever.

# Move the branch pointer back 3 commits.
# DESTROY ALL CODE CHANGES. Return the files to how they looked 3 commits ago.
git reset --hard HEAD~3

# Move the branch pointer back 3 commits.
# BUT KEEP THE CODE on your hard drive! Just uncommit it so you can fix it.
git reset --soft HEAD~3

The Public Apology: git revert You committed a bug and pushed it to GitHub. Your team downloaded it. You CANNOT use reset because erasing public history breaks your coworkers' laptops.

# Create a NEW commit that applies the exact opposite code of the bad commit
git revert 9f8a7b6

5. Mini Project: Recover Accidentally Deleted Commits #

Step-by-Step Walkthrough:

1. 1. Initialize: mkdir reset-demo && cd reset-demo && git init

1. 2. Create base: echo "V1" > file.txt && git add . && git commit -m "V1"

1. 3. Create the diamond: echo "V2 Perfect Code" > file.txt && git commit -am "V2"

1. 4. The Mistake: You meant to type --soft, but you accidentally typed:

1. 5. Check your folder. file.txt says "V1". Your perfect V2 code is completely eradicated from your hard drive and the git log.

1. 7. Find the hash of the "V2" commit (e.g., a1b2c3d).

• Mistake is UNCOMMITTED: Use git restore.

• Mistake is COMMITTED but LOCAL: Use git reset.

• Mistake is COMMITTED and PUSHED to GitHub: Use git revert.

• The Power of Soft Reset: git reset --soft is an incredible tool for squashing commits without dealing with interactive rebasing. If you have 5 messy commits, you can simply git reset --soft HEAD~5. All your code changes are kept perfectly intact in the staging area. You just type one git commit -m "All 5 features combined" and you have instantly squashed them.

• Confusing Reset with Revert: Junior developers constantly use git reset --hard to undo a commit they already pushed to GitHub. When they try to git push again, GitHub throws a massive error rejecting the push, because the local laptop is now "behind" the cloud server. They then panic and type git push --force, destroying the history for the entire company.

• Detached HEAD State: If you try to checkout a specific old commit hash instead of a branch name (git checkout 9f8a7b6), Git puts you in a "Detached HEAD" state. You are looking at the past, but you are not on a branch. Any commits you make here will float in the void and be deleted by garbage collection. To fix this, if you want to keep working in the past, instantly create a branch: git checkout -b new-branch-from-past.

1. 2. Explain the physical difference in the working directory when executing a --hard reset versus a --soft reset.