Working directory state in Git - Commands & Configuration

Introduction

When you work on files in a project, the working directory is where you make changes. It shows the current state of your files before you save or share them with others.

When you want to see which files you have changed but not yet saved to the project history.

When you want to check if you have new files that are not yet tracked by the project.

When you want to prepare files to be saved in the project history by adding them to the staging area.

When you want to undo changes in your files before saving them.

When you want to confirm the exact changes you made before sharing your work.

Commands

This command shows the current state of your working directory and staging area. It tells you which files are changed, new, or ready to be saved.

Terminal

git status

Expected Output

On branch main

Your branch is up to date with 'origin/main'.



Changes not staged for commit:

  (use "git add <file>..." to update what will be committed)

  (use "git restore <file>..." to discard changes in working directory)

	modified:   example.txt



Untracked files:

  (use "git add <file>..." to include in what will be committed)

	newfile.txt



no changes added to commit (use "git add" and/or "git commit -a")

This command shows the exact changes you made in the files that are not yet saved. It helps you review your edits line by line.

Terminal

git diff

Expected Output

diff --git a/example.txt b/example.txt

index e69de29..d95f3ad 100644

--- a/example.txt

+++ b/example.txt

@@ -0,0 +1,2 @@

+Hello world

+This is a new line

This command moves your changed file into the staging area, preparing it to be saved in the project history.

Terminal

git add example.txt

Expected Output

No output (command runs silently)

Run again to see that example.txt is now staged and ready to be saved.

Terminal

git status

Expected Output

On branch main

Your branch is up to date with 'origin/main'.



Changes to be committed:

  (use "git restore --staged <file>..." to unstage)

	modified:   example.txt



Untracked files:

  (use "git add <file>..." to include in what will be committed)

	newfile.txt

Key Concept

If you remember nothing else from this pattern, remember: the working directory shows your current file changes before you save them to the project history.

Common Mistakes

Trying to save changes without adding files to the staging area first.

Git only saves files that are staged, so unstaged changes will not be included in the save.

Use 'git add <file>' to stage your changes before committing.

Ignoring untracked files and expecting them to be saved automatically.

New files are not tracked until you add them, so they won't be saved or shared.

Use 'git add <newfile>' to start tracking new files.

Not checking 'git status' before committing.

You might miss files that are not staged or accidentally commit incomplete changes.

Always run 'git status' to review your working directory state before saving.

Summary

Use 'git status' to see which files are changed, new, or staged.

Use 'git diff' to review exact changes in your files before saving.

Use 'git add' to stage files so they will be saved in the next commit.

Practice

1. What does the git status command show you about your working directory?

easy

A. It shows which files are new, modified, or staged for commit.

B. It deletes all untracked files from the directory.

C. It permanently commits all changes to the repository.

D. It resets the repository to the last commit.

Solution

1. Step 1: Understand the purpose of git status

   This command checks the current state of the working directory and staging area.

2. Step 2: Identify what git status reports

   It lists new files, modified files, and files staged for commit, helping you track changes.

3. Final Answer:

   It shows which files are new, modified, or staged for commit. -> Option A

4. Quick Check:

   Working directory changes = git status output [OK]

Hint: Remember: git status shows current file changes and staging [OK]

Common Mistakes:

• Confusing git status with git commit
• Thinking git status deletes files
• Assuming git status changes files automatically

2. Which of the following commands correctly stages a file named app.js for commit?

easy

A. git commit app.js

B. git status app.js

C. git add app.js

D. git push app.js

Solution

1. Step 1: Identify the command to stage files

   The git add command is used to add files to the staging area.

2. Step 2: Confirm the correct syntax for staging a specific file

   Using git add app.js stages the file named app.js for the next commit.

3. Final Answer:

   git add app.js -> Option C

4. Quick Check:

   Stage files = git add [OK]

Hint: Use git add to stage files before committing [OK]

Common Mistakes:

• Using git commit to stage files
• Trying to use git status to stage
• Using git push before commit

3. Given the following sequence of commands, what will git status show about index.html?

echo 'Hello' > index.html
git add index.html
echo 'World' >> index.html
git status

medium

A. index.html is staged and has unstaged changes.

B. index.html is deleted.

C. index.html is untracked.

D. index.html is staged and unchanged.

Solution

1. Step 1: Analyze the commands on index.html

   First, 'Hello' is written and the file is staged with git add. Then 'World' is appended, modifying the file after staging.

2. Step 2: Understand git status output

   Git will show index.html as staged (with 'Hello') but also as modified (unstaged changes with 'World').

3. Final Answer:

   index.html is staged and has unstaged changes. -> Option A

4. Quick Check:

   Modified after staging = staged + unstaged changes [OK]

Hint: Changes after git add show as unstaged modifications [OK]

Common Mistakes:

• Assuming staging updates automatically after file change
• Thinking file is untracked after git add
• Confusing staged with committed

4. You ran git add README.md but git status still shows README.md under 'Changes not staged for commit'. What is the likely cause?

medium

A. README.md is ignored by .gitignore.

B. You modified README.md after running git add.

C. You committed README.md already.

D. README.md is deleted from the working directory.

Solution

1. Step 1: Understand git add and file modification

   Running git add stages the current file state. If the file changes after, those changes are unstaged.

2. Step 2: Interpret git status showing unstaged changes

   If README.md appears under 'Changes not staged for commit', it means it was modified after staging.

3. Final Answer:

   You modified README.md after running git add. -> Option B

4. Quick Check:

   Modify after add = unstaged changes shown [OK]

Hint: Modify after git add causes unstaged changes [OK]

Common Mistakes:

• Assuming git add stages future changes automatically
• Thinking .gitignore affects already tracked files
• Confusing committed files with staged files

5. You want to prepare a commit but accidentally staged a large file secret.txt. How can you remove it from the staging area without deleting the file from your working directory?

hard

A. git checkout secret.txt

B. git rm secret.txt

C. git clean secret.txt

D. git reset secret.txt

Solution

1. Step 1: Understand the difference between unstaging and deleting

   To remove a file from staging but keep it in the working directory, you must unstage it.

2. Step 2: Identify the correct command to unstage a file

   git reset secret.txt removes the file from the staging area without deleting it from disk.

3. Final Answer:

   git reset secret.txt -> Option D

4. Quick Check:

   Unstage file = git reset filename [OK]

Hint: Use git reset to unstage files without deleting [OK]

Common Mistakes:

• Using git rm deletes the file from disk
• Using git checkout resets file content, not staging
• Using git clean deletes untracked files