Why diffing matters in Git - Quick Recap

Recall & Review

beginner

What is 'diffing' in Git?

Diffing in Git means comparing two versions of files to see what has changed between them.

beginner

Why is diffing important before committing changes?

It helps you review what you changed, catch mistakes, and avoid committing unwanted code.

intermediate

How does diffing help in team collaboration?

It shows exactly what changes each team member made, making it easier to understand and merge work.

beginner

What command shows the differences between your working files and the last commit?

The command is git diff. It displays changes not yet staged for commit.

intermediate

How does diffing reduce errors in software development?

By clearly showing changes, diffing helps spot bugs or unintended edits before they become part of the project.

What does the git diff command show?

A Differences between working files and last commit

B List of all commits in the repository

C Current branch name

D Status of remote branches

git diff shows changes in your working directory compared to the last commit.

Why should you use diffing before committing?

A To create a new branch

B To delete files

C To review changes and avoid mistakes

D To push changes to remote

Diffing helps you check your changes before saving them permanently with a commit.

How does diffing help when working with others?

A Prevents anyone else from editing files

B Automatically merges all changes

C Deletes other people's changes

D Shows what each person changed for easier merging

Diffing reveals individual changes so teams can combine work smoothly.

Which of these is NOT a benefit of diffing?

A Automatically fixing errors

B Understanding code changes

C Spotting bugs early

D Improving collaboration

Diffing shows changes but does not fix errors automatically.

What happens if you skip diffing before committing?

A Git will reject your commit

B You might commit unwanted or broken code

C Your changes get lost

D Your branch will be deleted

Without diffing, mistakes can sneak into your commits.

Explain in your own words why diffing is a crucial step in using Git.

Think about how seeing changes helps before saving them.

Describe how diffing supports teamwork when multiple people work on the same project.

Consider how knowing what others changed helps combine work.

Practice

1. What is the main purpose of using git diff in a project?

easy

A. To delete files from the repository

B. To create a new branch

C. To merge two branches automatically

D. To see the exact changes made between file versions

Solution

1. Step 1: Understand the function of git diff

   git diff shows differences between file versions or commits.

2. Step 2: Identify what git diff does not do

   It does not delete files, merge branches, or create branches.

3. Final Answer:

   To see the exact changes made between file versions -> Option D

4. Quick Check:

   Diffing = showing changes [OK]

Hint: Diff means showing changes between versions [OK]

Common Mistakes:

• Confusing diff with branch creation
• Thinking diff deletes files
• Assuming diff merges branches

2. Which of the following is the correct command to see unstaged changes in your working directory?

easy

A. git diff

B. git diff --staged

C. git status -s

D. git log

Solution

1. Step 1: Recall the meaning of git diff

   git diff shows unstaged changes in your working directory compared to the last commit.

2. Step 2: Understand other commands

   git diff --staged shows staged changes, git status -s shows status summary, and git log shows commit history.

3. Final Answer:

   git diff -> Option A

4. Quick Check:

   Unstaged changes = git diff [OK]

Hint: Use plain git diff for unstaged changes [OK]

Common Mistakes:

• Using git diff --staged for unstaged changes
• Confusing git status with diff output
• Using git log to see file changes

3. Given the following commands run in a git repository:

echo 'Hello' > file.txt
git add file.txt
echo 'World' >> file.txt
git diff

What will git diff show?

medium

A. The difference showing the addition of 'World' in file.txt

B. The entire content of file.txt

C. No output because all changes are staged

D. An error because file.txt is staged

Solution

1. Step 1: Analyze the commands

   First, 'Hello' is written and staged with git add. Then 'World' is appended but not staged.

2. Step 2: Understand what git diff shows

   git diff shows unstaged changes compared to the index (staged files). So it will show the addition of 'World'.

3. Final Answer:

   The difference showing the addition of 'World' in file.txt -> Option A

4. Quick Check:

   git diff = unstaged changes [OK]

Hint: git diff shows changes after last staging [OK]

Common Mistakes:

• Thinking git diff shows staged changes
• Expecting full file content output
• Assuming git diff errors on staged files

4. You ran git diff but it shows no output even though you edited a file. What is the most likely reason?

medium

A. You forgot to save the file after editing

B. You staged the changes with git add

C. You are on the wrong branch

D. The file is ignored by .gitignore

Solution

1. Step 1: Understand what git diff shows

   git diff shows unstaged changes in saved files.

2. Step 2: Consider why no changes appear

   If the changes are staged with git add, git diff shows no output because there are no unstaged changes.

3. Final Answer:

   You staged the changes with git add -> Option B

4. Quick Check:

   Staged changes = no unstaged diff output [OK]

Hint: Stage changes to clear unstaged diff output [OK]

Common Mistakes:

• Assuming staged changes show in git diff
• Thinking branch affects unstaged diff
• Confusing ignored files with unstaged changes

5. You want to review changes between two commits abc123 and def456. Which command correctly shows the differences?

hard

A. git diff --compare abc123..def456

B. git diff --staged abc123 def456

C. git diff abc123..def456

D. git diff --between abc123 def456

Solution

1. Step 1: Recall correct syntax for comparing commits

   The correct syntax uses two commit hashes separated by two dots: git diff abc123..def456.

2. Step 2: Identify invalid options

   git diff --staged abc123 def456 is invalid syntax, and options with --between or --compare do not exist.

3. Final Answer:

   git diff abc123..def456 -> Option C

4. Quick Check:

   Commit range uses two dots [OK]

Hint: Use two dots between commits for diff [OK]

Common Mistakes:

• Using git diff --staged for commit diffs
• Adding unsupported flags like --between
• Confusing diff syntax with log syntax