Why knowing how to undo matters in Git - See It in Action

Why Knowing How to Undo Matters in Git

📖 Scenario: You are working on a project using Git to manage your code. Sometimes, mistakes happen, like adding wrong files or making unwanted changes. Knowing how to undo these mistakes quickly helps keep your project clean and saves time.

🎯 Goal: Learn how to undo changes in Git using basic commands to reset files and commits safely.

📋 What You'll Learn

Create a new Git repository

Add a file with initial content

Make a change and stage it

Undo the staged change

Make a commit and undo the last commit

💡 Why This Matters

🌍 Real World

In real projects, mistakes happen often. Knowing how to undo changes in Git helps you fix errors without losing your work or breaking the project.

💼 Career

Developers and DevOps engineers use Git daily. Mastering undo commands is essential for safe and efficient code management.

1

Initialize a Git repository and add a file

Run git init to create a new Git repository. Then create a file named notes.txt with the content Hello Git. Finally, add the file to Git using git add notes.txt.

Git

# Run git init
# Create notes.txt with content 'Hello Git'
# Run git add notes.txt

Hint

Use git init to start a repo. Use echo to create the file. Use git add to stage it.

2

Make a change and stage it

Change the content of notes.txt to Hello Git Undo using echo. Then stage the change with git add notes.txt.

Git

git init

echo "Hello Git" > notes.txt

git add notes.txt

# Change notes.txt content to 'Hello Git Undo'
# Stage the changed file

Hint

Overwrite the file with new content using echo. Then stage it again.

3

Undo the staged change

Use git restore --staged notes.txt to unstage the change you just added.

Git

git init

echo "Hello Git" > notes.txt

git add notes.txt

echo "Hello Git Undo" > notes.txt

git add notes.txt

# Unstage the change to notes.txt

Hint

Use git restore --staged to remove a file from the staging area.

4

Make a commit and undo the last commit

Commit the current staged files with git commit -m "Initial commit". Then undo the last commit but keep the changes using git reset --soft HEAD~1. Finally, print the current Git status with git status.

Git

git init

echo "Hello Git" > notes.txt

git add notes.txt

echo "Hello Git Undo" > notes.txt

git add notes.txt

git restore --staged notes.txt

# Commit staged files with message "Initial commit"
# Undo the last commit but keep changes
# Show git status

Hint

Use git commit -m to commit. Use git reset --soft HEAD~1 to undo the commit but keep changes staged. Use git status to see the current state.

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