What is the difference between git reset --soft, --mixed, and --hard?

Expected Interview Answer

Step-by-Step Explanation

1. Step 1

   Pick a target commit

   Choose where HEAD should move, such as HEAD~1 to undo the last commit or a specific SHA.

2. Step 2

   Choose --soft to keep everything staged

   git reset --soft HEAD~1 moves the branch back but leaves changes staged, ready to recommit or amend.

3. Step 3

   Choose --mixed to unstage

   git reset --mixed HEAD~1 (the default) also clears the index, so changes remain in the working tree but unstaged.

4. Step 4

   Choose --hard to discard

   git reset --hard HEAD~1 resets HEAD, index, and working tree, permanently discarding uncommitted changes.

5. Step 5

   Verify state

   Run git status and git log to confirm the branch pointer and working directory are where you expect.

Code Example

# Move branch back one commit, keep changes STAGED
git reset --soft HEAD~1

# Default: move back, keep changes in working tree, UNSTAGED
git reset --mixed HEAD~1
git reset HEAD~1        # same thing, --mixed is default

# Move back and DISCARD all uncommitted changes
git reset --hard HEAD~1

# Recover a bad reset via the reflog
git reflog
git reset --hard HEAD@{1}

Follow-up Questions

• What is the difference between git reset and git revert?
• How can you recover work after an accidental git reset --hard?
• Why is rewriting history with reset dangerous on shared branches?
• What does git reset with a path (git reset HEAD file) do?
• How does git reset differ from git checkout for undoing changes?