Why knowing how to undo matters in Git - Quick Recap

Recall & Review

beginner

Why is it important to know how to undo changes in Git?

Knowing how to undo changes helps you fix mistakes quickly, avoid losing work, and keep your project history clean and understandable.

beginner

What Git command can you use to undo changes in your working directory before committing?

You can use git checkout -- <file> or git restore <file> to discard changes in your working directory.

intermediate

How does git reset help in undoing commits?

git reset moves the current branch pointer to a previous commit, allowing you to undo commits and optionally keep or discard changes.

intermediate

What is the difference between git revert and git reset?

git revert creates a new commit that undoes changes from a previous commit, preserving history. git reset moves the branch pointer and can remove commits from history.

beginner

How can undoing mistakes improve teamwork in Git projects?

Undoing mistakes cleanly prevents confusion, avoids conflicts, and keeps the shared project history clear, making collaboration smoother.

Which Git command safely undoes a commit by creating a new commit?

A git checkout

B git reset --hard

C git revert

D git stash

git revert creates a new commit that reverses changes, preserving history safely.

What does git reset --hard HEAD~1 do?

A Restores a file from the last commit

B Creates a new commit undoing the last one

C Saves changes temporarily

D Deletes the last commit and discards changes

This command moves the branch back one commit and discards all changes in working directory and index.

Which command discards changes in your working directory for a specific file?

A git commit

B git restore <file>

C git push

D git merge

git restore <file> discards uncommitted changes in that file.

Why should you be careful using git reset --hard?

A It permanently deletes uncommitted changes

B It creates a new commit

C It only affects remote branches

D It merges branches automatically

This command deletes changes in your working directory and index permanently.

What is a benefit of undoing mistakes in Git?

A Keeps project history clean and understandable

B Deletes the entire project

C Prevents pushing to remote

D Automatically fixes merge conflicts

Undoing mistakes helps maintain a clear and useful project history.

Explain why knowing how to undo changes in Git is important for a developer.

Think about what happens when you make a mistake in your code.

Describe the difference between git revert and git reset when undoing commits.

One keeps history safe, the other changes history.

Practice

1. Why is it important to know how to undo changes in Git?

easy

A. To create new branches

B. To fix mistakes and keep the project clean

C. To add more files to the repository

D. To merge two branches

Solution

1. Step 1: Understand the purpose of undoing in Git

   Undoing helps correct errors made during development, preventing unwanted changes from affecting the project.

2. Step 2: Recognize the benefit of a clean project history

   Keeping the project clean means the history is easier to read and maintain, which is important for teamwork and future updates.

3. Final Answer:

   To fix mistakes and keep the project clean -> Option B

4. Quick Check:

   Undoing fixes mistakes [OK]

Hint: Undoing fixes errors and keeps history clean [OK]

Common Mistakes:

• Confusing undo with adding files
• Thinking undo creates branches
• Mixing undo with merging

2. Which Git command unstages files that were added to the staging area by mistake?

easy

A. git commit --amend

B. git checkout <file>

C. git reset HEAD <file>

D. git merge --abort

Solution

1. Step 1: Identify the command to unstage files

   The command git reset HEAD <file> removes files from the staging area without deleting changes.

2. Step 2: Understand why other commands don't unstage

   git commit --amend changes the last commit, git checkout <file> discards changes, and git merge --abort cancels a merge.

3. Final Answer:

   git reset HEAD <file> -> Option C

4. Quick Check:

   Unstage files = git reset HEAD [OK]

Hint: Use git reset HEAD to unstage files [OK]

Common Mistakes:

• Using git commit --amend to unstage
• Confusing checkout with unstaging
• Trying to abort merge to unstage

3. What will be the output of the following commands if you want to discard changes in a file named app.js?

git status
git checkout -- app.js
git status

medium

A. The changes in app.js are discarded and it shows as unmodified

B. The changes are staged for commit

C. The file app.js is deleted from the project

D. The last commit is undone

Solution

1. Step 1: Understand what git checkout -- app.js does

   This command discards local changes in app.js, restoring it to the last committed state.

2. Step 2: Analyze the status before and after

   Before, git status shows changes in app.js. After, it shows no changes because they were discarded.

3. Final Answer:

   The changes in app.js are discarded and it shows as unmodified -> Option A

4. Quick Check:

   Checkout discards changes [OK]

Hint: git checkout -- filename discards local changes [OK]

Common Mistakes:

• Thinking checkout stages changes
• Believing checkout deletes files
• Confusing checkout with undoing commits

4. You accidentally committed a file with sensitive data. Which command helps you undo the last commit but keep the changes in your working directory to fix the file?

medium

A. git checkout HEAD~1

B. git revert HEAD

C. git reset --hard HEAD~1

D. git reset --soft HEAD~1

Solution

1. Step 1: Understand the difference between reset options

   git reset --soft HEAD~1 moves HEAD back one commit but keeps changes staged and in the working directory.

2. Step 2: Why other options don't fit

   git revert HEAD creates a new commit undoing changes, git reset --hard HEAD~1 deletes changes, and git checkout HEAD~1 detaches HEAD without undoing commit properly.

3. Final Answer:

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

4. Quick Check:

   Undo last commit but keep changes = git reset --soft [OK]

Hint: Use git reset --soft to undo commit but keep changes [OK]

Common Mistakes:

• Using --hard and losing changes
• Using revert which adds a new commit
• Using checkout which detaches HEAD

5. You want to undo multiple commits but keep the changes in your working directory to edit them before recommitting. Which sequence of commands achieves this safely?

hard

A. git reset --mixed HEAD~3; git add .; git commit -m "Updated commits"

B. git revert HEAD~3..HEAD; git push

C. git reset --hard HEAD~3; git commit -m "Undo commits"

D. git checkout HEAD~3; git commit -m "Undo commits"

Solution

1. Step 1: Understand what git reset --mixed HEAD~3 does

   This command moves HEAD back 3 commits and unstages changes but keeps them in the working directory for editing.

2. Step 2: Add and recommit after editing

   After editing, git add . stages changes and git commit -m "Updated commits" creates a new commit with the corrected changes.

3. Step 3: Why other options are incorrect

   git revert creates new commits undoing changes, git reset --hard deletes changes, and git checkout detaches HEAD without undoing commits properly.

4. Final Answer:

   git reset --mixed HEAD~3; git add .; git commit -m "Updated commits" -> Option A

5. Quick Check:

   Undo commits but keep changes = git reset --mixed + add + commit [OK]

Hint: Use git reset --mixed to undo commits but keep changes [OK]

Common Mistakes:

• Using git reset --hard and losing work
• Using git revert which adds undo commits
• Using git checkout which detaches HEAD