git reset soft vs mixed vs hard - When to Use Which

The Big Idea

What if you could rewind your project like a video, choosing exactly what to keep or erase?

The Scenario

Imagine you made several changes to your project files and committed them, but then realized you need to undo some or all of those changes. You try to fix this by manually deleting files, copying old versions, or redoing commits by hand.

The Problem

This manual undo process is slow and risky. You might delete important work by mistake, lose track of what was changed, or create confusion in your project history. It's easy to get stuck or make things worse.

The Solution

Using git reset with its soft, mixed, and hard options lets you undo commits safely and quickly. Each option controls how much of your work is kept or removed, so you can fix mistakes without losing important changes.

Before vs After

✗ Before

rm -rf changed_files
cp backup_files .
git commit -m 'fix mistakes'

✓ After

git reset --soft HEAD~1
git reset --mixed HEAD~1
git reset --hard HEAD~1

What It Enables

You can easily rewind your project to a previous state, choosing exactly how much to keep or discard, making fixes fast and safe.

Real Life Example

A developer accidentally commits unfinished work. Using git reset --soft, they undo the commit but keep changes staged to fix and recommit quickly without losing progress.

Key Takeaways

Soft reset undoes commits but keeps changes staged.

Mixed reset undoes commits and unstages changes but keeps them in files.

Hard reset undoes commits and discards all changes completely.

Practice

1. What does git reset --soft do to your changes after undoing a commit?

easy

A. It unstages the changes but keeps them in the folder.

B. It removes the changes from both staging and folder.

C. It keeps the changes staged and ready to commit again.

D. It deletes the commit and all changes permanently.

Solution

1. Step 1: Understand git reset --soft effect

   This option moves the HEAD pointer back but keeps all changes staged.

2. Step 2: Compare with other reset types

   Unlike mixed or hard, soft reset does not unstage or delete changes.

3. Final Answer:

   It keeps the changes staged and ready to commit again. -> Option C

4. Quick Check:

   soft reset = keep staged changes [OK]

Hint: Soft reset keeps changes staged for quick recommit [OK]

Common Mistakes:

• Confusing soft with mixed reset
• Thinking soft deletes changes
• Assuming soft unstages changes

2. Which of the following is the correct syntax to undo the last commit but keep changes unstaged?

easy

A. git reset --keep HEAD~1

B. git reset --soft HEAD~1

C. git reset --hard HEAD~1

D. git reset --mixed HEAD~1

Solution

1. Step 1: Identify the reset option for unstaging changes

   The --mixed option resets the commit and unstages changes but keeps them in the folder.

2. Step 2: Verify syntax correctness

   All commands use HEAD~1 to move one commit back; --mixed is the default and correct option here.

3. Final Answer:

   git reset --mixed HEAD~1 -> Option D

4. Quick Check:

   mixed reset = unstage but keep changes [OK]

Hint: Mixed reset unstages but keeps changes in folder [OK]

Common Mistakes:

• Using --soft when unstaging is needed
• Using --hard which deletes changes
• Using invalid --keep option

3. Given you committed changes but want to undo the commit and remove all changes from your working folder, what will be the result of git reset --hard HEAD~1?

medium

A. The commit is undone, changes remain staged.

B. The commit is undone, changes are deleted from folder and staging.

C. The commit is undone, changes remain unstaged in folder.

D. The commit is undone, changes are saved in stash.

Solution

1. Step 1: Understand --hard reset effect

   This option resets the commit and deletes all changes from both staging and working folder.

2. Step 2: Confirm no changes remain

   After hard reset, the working folder matches the commit pointed by HEAD, so changes are lost.

3. Final Answer:

   The commit is undone, changes are deleted from folder and staging. -> Option B

4. Quick Check:

   hard reset = delete changes from folder and staging [OK]

Hint: Hard reset deletes changes from folder and staging [OK]

Common Mistakes:

• Thinking hard reset keeps changes staged
• Confusing hard with mixed reset
• Assuming changes are saved in stash automatically

4. You ran git reset --soft HEAD~1 but your changes disappeared from staging. What is the likely cause?

medium

A. You ran git reset --mixed instead of soft.

B. You committed new changes after reset.

C. Your Git version does not support --soft option.

D. You actually ran git reset --hard by mistake.

Solution

1. Step 1: Analyze why changes are unstaged

   Soft reset keeps changes staged; if changes disappeared from staging, mixed reset was likely used.

2. Step 2: Check command confusion

   Mixed reset unstages changes but keeps them in folder, matching the symptom.

3. Final Answer:

   You ran git reset --mixed instead of soft. -> Option A

4. Quick Check:

   Mixed reset unstages changes, soft keeps staged [OK]

Hint: Unstaged changes? Check if mixed reset was used instead of soft [OK]

Common Mistakes:

• Confusing soft and mixed reset effects
• Assuming Git version lacks --soft support
• Thinking reset deletes changes automatically

5. You committed changes but realize you want to undo the commit, keep the changes unstaged, and then selectively stage some files. Which command sequence achieves this?

hard

A. git reset --mixed HEAD~1; git add <files>

B. git reset --soft HEAD~1; git add <files>

C. git reset --hard HEAD~1; git add <files>

D. git reset --soft HEAD~1; git reset HEAD <files>

Solution

1. Step 1: Undo commit and unstage changes

   git reset --mixed HEAD~1 moves HEAD back, unstages changes but keeps them in folder.

2. Step 2: Selectively stage files

   Use git add <files> to stage only desired files after unstaging.

3. Final Answer:

   git reset --mixed HEAD~1; git add <files> -> Option A

4. Quick Check:

   Mixed reset + selective add stages chosen files [OK]

Hint: Use mixed reset to unstage, then add files selectively [OK]

Common Mistakes:

• Using soft reset which keeps all changes staged
• Using hard reset which deletes changes
• Trying to unstage files after soft reset