git restore --staged to unstage - Commands & Configuration

Introduction

Sometimes you add files to be saved in your next snapshot by mistake. The command git restore --staged helps you remove those files from the list of changes to save, without deleting the changes themselves.

When you accidentally added a file to the staging area but want to keep editing it before saving.

When you want to remove a file from the next commit but keep your changes in the working folder.

When you staged multiple files but decide only some should be saved now.

When you want to fix a mistake before making a commit by unstaging files.

When you want to check the difference between staged and unstaged changes.

Commands

Check which files are staged and unstaged before making changes.

Terminal

git status

Expected Output

On branch main

Changes to be committed:

  (use "git restore --staged <file>..." to unstage)



	modified:   example.txt



Changes not staged for commit:

  (use "git add <file>..." to update what will be committed)



	modified:   notes.txt

Remove example.txt from the staging area so it won't be included in the next commit, but keep your changes in the file.

Terminal

git restore --staged example.txt

Expected Output

No output (command runs silently)

→

--staged - Specifies to unstage the file from the index (staging area) without changing the working directory.

Verify that example.txt is no longer staged but still modified in your working folder.

Terminal

git status

Expected Output

On branch main

Changes not staged for commit:

  (use "git add <file>..." to update what will be committed)



	modified:   example.txt

	modified:   notes.txt

Key Concept

If you remember nothing else from this pattern, remember: git restore --staged removes files from the next commit without losing your changes.

Common Mistakes

Using git restore example.txt without --staged to unstage.

This command changes the file in your working folder to match the last commit, losing your changes.

Use git restore --staged example.txt to only unstage without changing your file.

Trying to unstage files with git reset without understanding its effect.

git reset can also unstage but may confuse beginners; git restore --staged is clearer and safer.

Use git restore --staged for unstaging files in modern Git versions.

Summary

Use git status to see which files are staged or unstaged.

Run git restore --staged filename to remove a file from the staging area without losing changes.

Check again with git status to confirm the file is unstaged but still modified.

Practice

1. What does the command git restore --staged <file> do in Git?

easy

A. It commits the file to the repository.

B. It deletes the file from the working directory and staging area.

C. It removes the file from the staging area but keeps the changes in the working directory.

D. It discards all changes in the file and restores it to the last commit.

Solution

1. Step 1: Understand the staging area role

   The staging area holds files ready to be committed, but changes still exist in the working directory.

2. Step 2: Effect of git restore --staged

   This command removes the file from staging but keeps your edits in the working directory, so you can fix or adjust before committing.

3. Final Answer:

   It removes the file from the staging area but keeps the changes in the working directory. -> Option C

4. Quick Check:

   Unstage = remove from staging, keep edits [OK]

Hint: Unstage means remove from staging, keep your edits [OK]

Common Mistakes:

• Thinking it deletes the file from disk
• Confusing it with discarding changes
• Assuming it commits the file immediately

2. Which of the following is the correct syntax to unstage a file named app.js using git restore?

easy

A. git restore --staged app.js

B. git restore app.js --staged

C. git restore --unstage app.js

D. git restore --remove app.js

Solution

1. Step 1: Recall correct option order for flags

   In Git commands, flags usually come before the file names.

2. Step 2: Apply to git restore --staged

   The correct syntax places --staged before the file name: git restore --staged app.js.

3. Final Answer:

   git restore --staged app.js -> Option A

4. Quick Check:

   Flags before files = correct syntax [OK]

Hint: Put flags before filenames in git commands [OK]

Common Mistakes:

• Placing --staged after the filename
• Using non-existent flags like --unstage
• Confusing restore with reset commands

3. Given the following sequence of commands:

echo 'initial' > file.txt
 git add file.txt
 git commit -m 'initial'
 echo 'Hello' > file.txt
 git add file.txt
 git restore --staged file.txt
 git status

What will git status show about file.txt?

medium

A. file.txt is staged for commit.

B. file.txt is deleted.

C. file.txt is unmodified and not staged.

D. file.txt is modified but not staged.

Solution

1. Step 1: Analyze the commands step-by-step

   First, 'Hello' is written to file.txt. Then, git add stages it. Next, git restore --staged file.txt removes it from staging but keeps the change.

2. Step 2: Understand the status after unstaging

   Since the file is modified but unstaged, git status will show it as modified but not staged for commit.

3. Final Answer:

   file.txt is modified but not staged. -> Option D

4. Quick Check:

   Unstaged changes = modified but not staged [OK]

Hint: Unstaged files show as modified but not staged [OK]

Common Mistakes:

• Assuming file is still staged after restore --staged
• Thinking file is unmodified after unstaging
• Confusing unstaged with deleted

4. You ran git restore --staged myfile.txt but got an error: error: pathspec 'myfile.txt' did not match any files. What is the most likely cause?

medium

A. The file myfile.txt is not currently staged.

B. You misspelled the command; it should be git reset --staged.

C. The file does not exist in the working directory.

D. You need to add --force to the command.

Solution

1. Step 1: Understand the error message meaning

   The error says the file path does not match any staged files, meaning Git can't find it in the staging area.

2. Step 2: Check the file's staging status

   If the file is not staged, git restore --staged cannot unstage it, causing this error.

3. Final Answer:

   The file myfile.txt is not currently staged. -> Option A

4. Quick Check:

   Unstage error means file not staged [OK]

Hint: File must be staged to unstage it [OK]

Common Mistakes:

• Assuming command syntax is wrong
• Thinking file must exist only in working directory
• Trying to force unstage without staging first

5. You staged two files, index.html and style.css, but realize you only want to commit index.html. Which command correctly unstages style.css without losing your edits?

hard

A. git checkout -- style.css

B. git restore --staged style.css

C. git reset --hard style.css

D. git rm --cached style.css

Solution

1. Step 1: Identify the goal

   You want to unstage style.css but keep your changes in the working directory.

2. Step 2: Compare commands

   git restore --staged style.css unstages the file but keeps edits.
   git reset --hard style.css is invalid syntax with paths and cannot unstage a specific file.
   git checkout -- style.css updates working tree from index but does not unstage.
   git rm --cached style.css stages a deletion, which is not desired.

3. Final Answer:

   git restore --staged style.css -> Option B

4. Quick Check:

   Use restore --staged to unstage safely [OK]

Hint: Use git restore --staged to unstage without losing edits [OK]

Common Mistakes:

• Using git checkout which discards changes
• Using git rm --cached which removes file tracking
• Confusing git reset with discard commands