Dropping and clearing stashes in Git - Step-by-Step Execution

Process Flow - Dropping and clearing stashes

List stashes

↓

Choose stash to drop?

No→Exit

Yes↓

Run git stash drop <stash>

↓

Stash removed

↓

Clear all stashes?

No→Exit

Yes↓

Run git stash clear

↓

All stashes removed

↓

Exit

Shows the flow of listing stashes, optionally dropping one stash, and optionally clearing all stashes.

Execution Sample

Git

git stash list
git stash drop stash@{0}
git stash clear

List all stashes, drop the first stash, then clear all remaining stashes.

Process Table

Step	Command	Action	Result	Notes
1	git stash list	Show all stashes	stash@{0}: WIP on main: fix bug stash@{1}: WIP on main: add feature	Two stashes exist
2	git stash drop stash@{0}	Remove stash@{0}	Dropped stash@{0} (WIP on main: fix bug)	First stash removed
3	git stash list	Show remaining stashes	stash@{0}: WIP on main: add feature	One stash left, reindexed to stash@{0}
4	git stash clear	Remove all stashes		All stashes removed
5	git stash list	Show stashes		No stashes found, list empty

💡 All stashes cleared, no more stashes remain

Status Tracker

Variable	Start	After Step 2	After Step 4	Final
stash list	stash@{0}: WIP on main: fix bug, stash@{1}: WIP on main: add feature	stash@{0}: WIP on main: add feature	empty	empty

Key Moments - 2 Insights

Why does stash@{1} become stash@{0} after dropping stash@{0}?

Git renumbers stashes after dropping one, so the next stash shifts to stash@{0} as shown in step 3 of the execution table.

What happens if you run 'git stash clear' when no stashes exist?

It simply does nothing and no error occurs, because the stash list is already empty as shown after step 5.

Visual Quiz - 3 Questions

Look at the execution table, what is the stash list after step 2?

A stash@{0}: WIP on main: add feature

B stash@{0}: WIP on main: fix bug

C empty

D stash@{0}: WIP on main: fix bug, stash@{1}: WIP on main: add feature

💡 Hint

Check the 'Result' column at step 3 in the execution table.

At which step does the stash list become empty?

A Step 2

B Step 5

C Step 4

D Step 3

💡 Hint

Look at the 'Result' column for step 5 in the execution table.

If you skip 'git stash drop' and run 'git stash clear' directly, what changes in the execution table?

A No changes, same steps happen

B Step 4 is missing, stashes remain

C Step 2 is missing, stash list goes from two stashes to empty at step 3

D Stashes are doubled

💡 Hint

Compare the commands and results in the execution table steps.

Concept Snapshot

git stash drop <stash> removes a single stash by name.
git stash clear removes all stashes at once.
After dropping, stash indexes shift.
Use 'git stash list' to see current stashes.
Clearing empties the stash list completely.

Full Transcript

This visual trace shows how to manage git stashes by dropping one stash or clearing all. First, 'git stash list' shows all saved stashes. Then, 'git stash drop stash@{0}' removes the first stash, causing the remaining stashes to renumber. Running 'git stash clear' deletes all stashes. Finally, 'git stash list' confirms the stash list is empty. This helps keep your stash clean and organized.

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