Git Stash

# Save changes
git stash
 
# Shows: Saved working directory and index state WIP on main: abc1234 Last commit
 
# Working directory is now clean
git status
# nothing to commit, working tree clean

# Apply most recent stash (doesn't delete it)
git stash apply
 
# Apply specific stash
git stash apply stash@{2}
 
# Apply and remove in one command
git stash pop

git stash list
# stash@{0}: WIP on main: abc1234 My commit
# stash@{1}: WIP on feature: def5678 Another commit
# stash@{2}: On feature: ghi9012 Yet another

# See what's in most recent stash
git stash show
 
# See detailed diff
git stash show -p
git stash show stash@{1} -p

# Delete specific stash
git stash drop stash@{1}
 
# Delete all stashes
git stash clear

# Stash with descriptive name
git stash save "WIP on search feature"
# or newer syntax:
git stash push -m "WIP on search feature"
 
# List shows names
git stash list
# stash@{0}: WIP on search feature

git checkout feature/search
# error: Your local changes to 'index.ts' would be overwritten
 
# Stash the changes
git stash
 
# Now you can switch
git checkout feature/search
 
# Later, switch back and restore
git checkout main
git stash pop

# Stash on main
git stash
 
# Create branch from stash
git stash branch feature/fixes
# Creates new branch and applies stash
 
# If stash was already applied elsewhere:
git stash drop stash@{0}

# Stashed changes on main
git stash
 
# Switch to feature branch
git checkout feature/auth
 
# Apply stash there
git stash apply

# Stash only tracked files (not new ones)
git stash
 
# Stash new untracked files too
git stash -u  # --include-untracked
 
# Stash only staged changes
git stash --staged

# Stash but keep staged changes
git stash --keep-index
 
# Useful to preserve staging area

# Interactive stash (like git add -p)
git stash -p
 
# Choose hunks to stash interactively
 
# Remaining changes stay in working directory

# Convert stash to proper commit
git stash apply stash@{0}
git add files
git commit -m "Proper commit message"
 
# Clean up
git stash drop stash@{0}

# Working on feature
git switch -c feature/search
# Make changes
git add search.ts
 
# Urgent bugfix needed
git stash                    # Save progress
git switch main
git switch -c hotfix/urgent
# Fix and commit
git switch main
git merge hotfix/urgent
 
# Resume feature work
git switch feature/search
git stash pop

git stash push -m "filters UI"
git stash push -m "search algorithm"
 
git stash list
# stash@{0}: On main: search algorithm
# stash@{1}: On main: filters UI
 
# Apply different ones as needed
git stash apply stash@{1}