git restore to discard working changes - Cheat Sheet & Quick Revision

Recall & Review

beginner

What does the command git restore <file> do?

It discards changes in the working directory for the specified file, restoring it to the last committed state.

beginner

How do you discard all local changes in all files using git restore?

Use git restore . to discard changes in all files in the current directory and its subdirectories.

intermediate

What is the difference between git restore <file> and git checkout -- <file>?

git restore is the newer, clearer command to discard changes, while git checkout -- <file> was used before for the same purpose but also has other uses.

beginner

Can git restore undo changes that have already been committed?

No, git restore only affects uncommitted changes in the working directory. To undo commits, other commands like git revert or git reset are used.

intermediate

What happens if you run git restore <file> on a new untracked file?

Nothing happens because git restore only works on files tracked by Git. Untracked files remain unchanged.

Which command discards changes in a tracked file and restores it to the last commit?

A git push origin main

B git restore <file>

C git commit -m 'discard changes'

D git add <file>

git restore <file> resets the file to the last committed state, discarding local changes.

What does git restore . do?

A Restores all files in the current directory to last commit

B Adds all files to the staging area

C Deletes all files in the directory

D Commits all changes

This command discards all local changes in the current directory and subdirectories.

Can git restore recover deleted commits?

A No, it deletes commits permanently

B Yes, it recovers deleted commits

C Yes, but only if used with --hard

D No, it only affects uncommitted changes

git restore only works on working directory changes, not commits.

What happens if you run git restore <file> on a new file not tracked by Git?

A The file is added to Git

B The file is deleted

C Nothing, the file remains unchanged

D The file is committed

Untracked files are not affected by git restore.

Which command was commonly used before git restore to discard changes in a file?

A git checkout -- <file>

B git reset <file>

C git revert <file>

D git commit --amend

git checkout -- <file> was used to discard changes before git restore was introduced.

Explain how to discard changes in a single file using Git and what happens to the file after running the command.

Think about how to undo local edits without affecting commits.

Describe the difference between discarding changes with git restore and undoing commits in Git.

Consider what part of the project each command changes.

Practice

1. What does the command git restore <filename> do in a Git repository?

easy

A. It permanently deletes the specified file from the repository history.

B. It discards changes in the specified file and restores it to the last committed state.

C. It stages the specified file for the next commit.

D. It creates a new branch with the name of the specified file.

Solution

1. Step 1: Understand the purpose of git restore

   The git restore command is used to undo changes in the working directory before committing.

2. Step 2: Effect on the specified file

   Using git restore <filename> resets the file to its last committed state, discarding any edits made since then.

3. Final Answer:

   It discards changes in the specified file and restores it to the last committed state. -> Option B

4. Quick Check:

   Undo changes = git restore [OK]

Hint: Use git restore to undo file edits before commit [OK]

Common Mistakes:

• Confusing restore with delete or branch creation
• Thinking it stages files instead of discarding changes
• Assuming it affects commit history

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

easy

A. git restore app.js

B. git restore --discard app.js

C. git restore -d app.js

D. git restore --reset app.js

Solution

1. Step 1: Recall the basic syntax of git restore

   The command to discard changes in a file is simply git restore <filename> without extra flags.

2. Step 2: Check the options given

   Options B, C, and D use incorrect or non-existent flags. Only git restore app.js uses the correct syntax.

3. Final Answer:

   git restore app.js -> Option A

4. Quick Check:

   Correct syntax = git restore filename [OK]

Hint: Use git restore filename without extra flags to discard changes [OK]

Common Mistakes:

• Adding unnecessary flags like --discard or --reset
• Using shorthand flags that don't exist
• Confusing git restore with git reset

3. Given the following sequence of commands in a Git repository:

echo 'Hello' > file.txt
git add file.txt
echo 'World' >> file.txt
git restore file.txt
cat file.txt

What will be the output of cat file.txt?

medium

A. Hello

B. World

C. Hello\nWorld

D. file.txt: No such file or directory

Solution

1. Step 1: Understand the commands before restore

   First, 'Hello' is written to file.txt and staged. Then 'World' is appended but not staged.

2. Step 2: Effect of git restore on file.txt

   The git restore file.txt discards the unstaged changes, reverting file.txt to the last staged (or committed) state which contains only 'Hello'.

3. Step 3: Output of cat file.txt

   After restore, file.txt contains only 'Hello'. So, cat file.txt outputs 'Hello'.

4. Final Answer:

   Hello -> Option A

5. Quick Check:

   Restore discards unstaged changes = Hello [OK]

Hint: Restore resets file to last staged or committed state [OK]

Common Mistakes:

• Assuming restore keeps appended changes
• Confusing staged and unstaged changes
• Expecting both lines to appear after restore

4. You ran git restore file.txt but your changes were not discarded. What is the most likely reason?

medium

A. Git restore only works on new files, not modified ones.

B. The file was already committed and has no changes to discard.

C. You used the wrong filename in the command.

D. You have staged the changes, so restore does not affect them by default.

Solution

1. Step 1: Understand git restore behavior with staged changes

   By default, git restore <file> only discards unstaged changes. Staged changes remain unless you add the --staged flag.

2. Step 2: Analyze why changes were not discarded

   If changes were staged, running restore without --staged won't discard them, so the file appears unchanged.

3. Final Answer:

   You have staged the changes, so restore does not affect them by default. -> Option D

4. Quick Check:

   Restore ignores staged changes unless --staged used [OK]

Hint: Use --staged to discard staged changes with git restore [OK]

Common Mistakes:

• Assuming restore discards staged changes without flags
• Thinking restore works only on new files
• Not checking if filename is correct

5. You have modified three files: index.html, style.css, and script.js. You staged index.html and style.css but want to discard only the unstaged changes in style.css and script.js. Which command will achieve this?

hard

A. git restore --discard style.css script.js

B. git restore --staged style.css script.js

C. git restore style.css script.js

D. git restore --staged style.css && git restore script.js

Solution

1. Step 1: Identify which changes to discard

   You want to discard unstaged changes in style.css and script.js. Staged changes should remain.

2. Step 2: Choose the correct git restore command

   git restore --discard style.css script.js uses invalid --discard flag. Options B and C use --staged which would discard staged changes, which is not desired. git restore style.css script.js discards unstaged changes only.

3. Final Answer:

   git restore style.css script.js -> Option C

4. Quick Check:

   Restore without --staged discards unstaged changes [OK]

Hint: Restore files without --staged to discard only unstaged changes [OK]

Common Mistakes:

• Using --staged and discarding staged changes accidentally
• Running separate commands unnecessarily
• Using invalid flags like --discard