git restore --staged to unstage - Cheat Sheet & Quick Revision

Recall & Review

beginner

What does the command git restore --staged <file> do?

It removes the specified file from the staging area, effectively 'unstaging' it, so changes won't be included in the next commit.

beginner

How do you unstage all files that were added to the staging area?

Use git restore --staged . to unstage all files at once.

intermediate

What is the difference between git restore --staged and git reset?

git restore --staged unstages files without changing the working directory, while git reset can unstage and also move the HEAD pointer.

beginner

True or False: git restore --staged deletes your changes in the file.

False. It only removes the file from the staging area but keeps your changes in the working directory.

beginner

Why might you want to use git restore --staged before committing?

To remove files accidentally added to the staging area, so you only commit the intended changes.

What does git restore --staged file.txt do?

A Commits file.txt to the repository

B Deletes file.txt from the working directory

C Removes file.txt from the staging area

D Adds file.txt to the staging area

This command unstages the file, so it won't be included in the next commit.

Which command unstages all files at once?

A git status

B git commit -a

C git add .

D git restore --staged .

git restore --staged . unstages all files currently staged.

Does git restore --staged delete your changes in the file?

A Yes, it deletes changes

B No, it only unstages the file

C Yes, it resets the file to last commit

D No, it commits the changes

The command only removes the file from staging but keeps your changes in the working directory.

What is a common reason to use git restore --staged?

A To fix accidentally staged files before committing

B To delete files from the project

C To push changes to remote

D To create a new branch

It helps you remove files from staging if you added them by mistake.

Which command is a newer alternative to unstage files instead of git reset HEAD <file>?

A git restore --staged <file>

B git commit --amend

C git checkout <file>

D git push

git restore --staged is the modern way to unstage files.

Explain how git restore --staged helps manage your commits.

Think about what happens when you add files by mistake.

Describe the difference between git restore --staged and git reset when unstaging files.

Consider what each command affects: staging area, working directory, and commit history.

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