Stashing specific files in Git - Commands & Configuration

Introduction

Sometimes you want to save only some changes in your project temporarily without committing them. Git stash lets you do this, and you can choose to stash just specific files instead of everything.

When you are working on multiple files but want to save changes only from one file to switch branches quickly.

When you want to test something else but keep some file changes safe without committing.

When you accidentally modified files but want to stash only a few before running a build or test.

When you want to share your work but keep some changes private temporarily.

When you want to clean your working directory but keep some changes saved for later.

Commands

This command saves changes only from file1.txt into a new stash with a message describing it.

Terminal

git stash push -m "stash only file1.txt" -- file1.txt

Expected Output

Saved working directory and index state WIP on main: abc1234 Commit message

→

-m - Adds a descriptive message to the stash for easy identification

Shows all saved stashes so you can see the one you just created.

Terminal

git stash list

Expected Output

stash@{0}: On main: stash only file1.txt

Displays the exact changes saved in the stash number 0, so you can verify what was stashed.

Terminal

git stash show -p stash@{0}

Expected Output

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

index e69de29..d95f3ad 100644

--- a/file1.txt

+++ b/file1.txt

@@ -0,0 +1 @@

+Example change in file1.txt

Applies the stashed changes back to your working directory and removes the stash from the list.

Terminal

git stash pop stash@{0}

Expected Output

On branch 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:   file1.txt



Dropped stash@{0} (abc1234 Commit message)

Key Concept

If you remember nothing else from this pattern, remember: git stash push lets you save changes from specific files only, not the whole project.

Common Mistakes

Running 'git stash' without specifying files when you want to stash only some files.

This stashes all changes, not just the specific files you want, which can cause confusion or loss of control.

Use 'git stash push' followed by the file names to stash only those files.

Trying to stash files that are not modified or staged.

Git will not stash unmodified files, so the stash will be empty or not include those files.

Make sure the files you want to stash have changes before running the stash command.

Forgetting to specify the stash name or message, making it hard to identify later.

Without a message, it is difficult to know what changes are in each stash.

Always use the -m flag with a clear message describing the stashed files or purpose.

Summary

Use 'git stash push -m "message" -- file1.txt' to stash changes from specific files only.

Check your stashes with 'git stash list' and see details with 'git stash show -p'.

Apply stashed changes back with 'git stash pop' to continue working on them.

Practice

1. What does the command git stash push -m "save changes" file.txt do?

easy

A. It saves changes only from file.txt to a new stash with a message.

B. It saves all changes in the working directory to a stash with a message.

C. It commits file.txt with the message "save changes".

D. It deletes file.txt and saves the rest to stash.

Solution

1. Step 1: Understand the git stash push command

   This command saves changes in the working directory to a stash instead of committing.

2. Step 2: Recognize the effect of specifying a file

   By adding file.txt, only changes in that file are saved to the stash, not all files.

3. Final Answer:

   It saves changes only from file.txt to a new stash with a message. -> Option A

4. Quick Check:

   Stash specific file = It saves changes only from file.txt to a new stash with a message. [OK]

Hint: Use git stash push with file names to stash specific files [OK]

Common Mistakes:

• Thinking it stashes all files without specifying
• Confusing stash with commit
• Assuming it deletes files

2. Which of the following is the correct syntax to stash only -index.html and style.css files?

easy

A. git stash push -- -index.html style.css

B. git stash push -- files -index.html style.css

C. git stash push -index.html style.css

D. git stash push -f -index.html style.css

Solution

1. Step 1: Recall the syntax for stashing specific files

   The correct syntax uses git stash push -- <files> to specify files.

2. Step 2: Identify the correct option

   git stash push -- -index.html style.css uses -- before file names, which is required to separate options from file paths.

3. Final Answer:

   git stash push -- -index.html style.css -> Option A

4. Quick Check:

   Use -- before files to stash specific files [OK]

Hint: Always use -- before file names in stash command [OK]

Common Mistakes:

• Omitting -- before file names
• Using unsupported flags like -f
• Adding extra words like 'files'

3. Given these changes:
-file1.txt modified, file2.txt modified, file3.txt unchanged.
What will be the output of git stash push -- -file1.txt followed by git stash list?

medium

A. Shows an error because multiple files are modified.

B. Shows a stash with -file1.txt and file2.txt changes saved.

C. Shows a stash with only -file1.txt changes saved.

D. Shows no stash because file2.txt is not included.

Solution

1. Step 1: Understand what git stash push -- -file1.txt does

   This command saves only changes from -file1.txt to a new stash.

2. Step 2: Check the stash list output

   After stashing, git stash list shows the new stash entry with only -file1.txt changes saved.

3. Final Answer:

   Shows a stash with only -file1.txt changes saved. -> Option C

4. Quick Check:

   Stash specific file = stash list shows that file only [OK]

Hint: Stash command saves only specified files, stash list shows saved entries [OK]

Common Mistakes:

• Assuming all modified files are stashed
• Expecting an error when multiple files are modified
• Confusing stash list output with file contents

4. You run git stash push -file1.txt but get an error: error: unknown option '-file1.txt'. What is the likely cause?

medium

A. You used the wrong command; git stash save is required.

B. The file -file1.txt does not exist.

C. You need to commit changes before stashing.

D. You forgot to add -- before the file name.

Solution

1. Step 1: Analyze the error message

   The error says unknown option '-file1.txt', meaning Git treats the file name as an option.

2. Step 2: Identify correct syntax for stashing specific files

   You must use -- before file names to separate options from file paths.

3. Final Answer:

   You forgot to add -- before the file name. -> Option D

4. Quick Check:

   Missing -- causes unknown option error [OK]

Hint: Add -- before files to avoid option parsing errors [OK]

Common Mistakes:

• Omitting -- before file names
• Assuming file must be committed first
• Using deprecated stash commands

5. You have modified -app.js, index.html, and style.css. You want to stash only -app.js and style.css, then later apply those changes back. Which sequence of commands correctly does this?

hard

A. git stash push -app.js style.cssgit stash apply

B. git stash push -m "partial stash" -- -app.js style.cssgit stash apply stash@{0}

C. git stash save -app.js style.cssgit stash pop

D. git stash push -app.js style.cssgit stash pop stash@{1}

Solution

1. Step 1: Stash specific files with a message

   Use git stash push -m "partial stash" -- -app.js style.css to stash only selected files with a label.

2. Step 2: Apply the correct stash entry

   Use git stash apply stash@{0} to apply the most recent stash explicitly.

3. Final Answer:

   git stash push -m "partial stash" -- -app.js style.css
   git stash apply stash@{0} -> Option B

4. Quick Check:

   Use -m and -- with files, then apply stash by name [OK]

Hint: Use -m for message and -- before files, then apply stash by reference [OK]

Common Mistakes:

• Using deprecated git stash save
• Omitting -- before file names
• Applying stash without specifying correct stash reference