Dropping and clearing stashes in Git - Commands & Configuration

Introduction

Sometimes you save changes temporarily in git using stashes. When you no longer need these saved changes, you can remove them to keep your workspace clean.

When you saved changes with git stash but decided you don't need them anymore.

When your stash list is full of old stashes that clutter your project.

When you want to remove a specific stash after applying it successfully.

When you want to clear all stashes to start fresh.

When you want to avoid confusion by deleting unused saved changes.

Commands

This command shows all the saved stashes so you can see what you have before deleting any.

Terminal

git stash list

Expected Output

stash@{0}: WIP on main: 123abc4 Fix header layout

stash@{1}: WIP on main: 789def0 Add login button

This command deletes the specific stash identified by stash@{1} to remove unwanted saved changes.

Terminal

git stash drop stash@{1}

Expected Output

Dropped stash@{1} (WIP on main: 789def0 Add login button)

This command removes all stashes at once, cleaning up your stash list completely.

Terminal

git stash clear

Expected Output

No output (command runs silently)

Check the stash list again to confirm the stashes were removed.

Terminal

git stash list

Expected Output

No output (command runs silently)

Key Concept

If you remember nothing else from this pattern, remember: use 'git stash drop' to remove one stash and 'git stash clear' to remove all stashes.

Common Mistakes

Trying to drop a stash without specifying the stash name or index.

Git will not know which stash to delete and will show an error.

Always specify the stash to drop, like 'git stash drop stash@{0}'.

Using 'git stash clear' without checking what stashes exist.

You might delete stashes you still need, losing saved work.

Run 'git stash list' first to review stashes before clearing all.

Summary

Use 'git stash list' to see all saved stashes.

Use 'git stash drop stash@{n}' to delete a specific stash.

Use 'git stash clear' to remove all stashes at once.

Practice

1. What does the git stash drop command do?

easy

A. Removes a single stash entry from the stash list

B. Removes all stash entries at once

C. Creates a new stash entry

D. Shows the list of all stash entries

Solution

1. Step 1: Understand the purpose of git stash drop

   This command is used to remove one specific stash entry from the stash list.

2. Step 2: Differentiate from clearing all stashes

   git stash clear removes all stashes, not just one.

3. Final Answer:

   Removes a single stash entry from the stash list -> Option A

4. Quick Check:

   Drop = remove one stash [OK]

Hint: Drop removes one stash, clear removes all [OK]

Common Mistakes:

• Confusing drop with clear
• Thinking drop creates a stash
• Assuming drop shows stash list

2. Which of the following is the correct syntax to clear all stashes in git?

easy

A. git stash drop --all

B. git stash delete --all

C. git stash clear

D. git stash remove all

Solution

1. Step 1: Identify the command to clear all stashes

   The correct command to remove all stash entries is git stash clear.

2. Step 2: Check other options for correctness

   Options A, B, and C are not valid git commands for clearing stashes.

3. Final Answer:

   git stash clear -> Option C

4. Quick Check:

   Clear = remove all stashes [OK]

Hint: Use 'git stash clear' to delete all stashes at once [OK]

Common Mistakes:

• Using 'drop --all' which is invalid
• Trying 'remove all' which is not a git command
• Confusing delete with clear

3. Given the stash list:
stash@{0}: WIP on feature
stash@{1}: Fix bug
stash@{2}: Update docs
What will be the stash list after running git stash drop stash@{1}?

medium

A. stash@{0}: WIP on featurestash@{1}: Fix bug

B. stash@{0}: WIP on featurestash@{1}: Fix bugstash@{2}: Update docs

C. stash@{0}: Fix bugstash@{1}: Update docs

D. stash@{0}: WIP on featurestash@{1}: Update docs

Solution

1. Step 1: Understand what git stash drop stash@{1} does

   This command removes the stash at index 1, which is 'Fix bug'.

2. Step 2: Recognize stash reindexing after drop

   After dropping stash@{1}, stash@{2} moves up to stash@{1} position.

3. Final Answer:

   stash@{0}: WIP on feature
   stash@{1}: Update docs -> Option D

4. Quick Check:

   Drop stash@{1} removes it and shifts others up [OK]

Hint: Dropped stash removed, higher indexes shift down [OK]

Common Mistakes:

• Not realizing stash indexes shift after drop
• Assuming stash@{1} remains after drop
• Confusing stash names with indexes

4. You tried to remove all stashes using git stash drop without any arguments, but it did not remove all stashes. What is the likely cause?

medium

A. The command git stash drop clears all stashes by default

B. git stash drop without argument removes only the most recent stash (stash@{0}), not all

C. You need to run git stash clear before drop works

D. You must be on the master branch to drop stashes

Solution

1. Step 1: Understand git stash drop usage

   This command removes one stash: stash@{0} (most recent) if no argument given, or a specific stash if referenced.

2. Step 2: Identify why it doesn't remove all

   Without argument, it only drops the most recent stash, not all. To remove all, repeat or use git stash clear.

3. Final Answer:

   git stash drop without argument removes only the most recent stash (stash@{0}), not all -> Option B

4. Quick Check:

   Drop w/o arg = drop stash@{0} only [OK]

Hint: drop w/o arg removes latest only, clear removes all [OK]

Common Mistakes:

• Assuming drop clears all stashes
• Thinking drop without argument does nothing
• Thinking branch affects stash drop

5. You have multiple stashes and want to remove all except the most recent one. Which sequence of commands achieves this safely?

hard

A. Run git stash drop stash@{1} repeatedly for all except stash@{0}

B. Run git stash clear then create a new stash for the most recent changes

C. Run git stash pop to apply and remove all stashes except the latest

D. Run git stash drop stash@{0} to remove the latest stash only

Solution

1. Step 1: Understand stash indexing and removal

   Stashes are indexed from 0 (most recent) upwards. To keep the latest, remove others starting from index 1.

2. Step 2: Use git stash drop stash@{1} repeatedly

   Dropping stash@{1} repeatedly removes older stashes safely without affecting the latest stash@{0}.

3. Final Answer:

   Run git stash drop stash@{1} repeatedly for all except stash@{0} -> Option A

4. Quick Check:

   Drop specific stashes to keep latest safe [OK]

Hint: Drop stashes from index 1 up to keep latest [OK]

Common Mistakes:

• Using clear which deletes all stashes
• Using pop which applies and removes only one stash
• Dropping stash@{0} which removes the latest stash