# Basic stash (saves staged and unstaged changes)
git stash

# Stash with descriptive message (recommended)
git stash push -m "Work in progress: user authentication feature"

# Modern syntax (Git 2.13+)
git stash push -m "Feature: add login validation"

# Legacy syntax (still works)
git stash save "Feature: add login validation"

# View all stashes
git stash list

# Output example:
stash@{0}: On feature-login: Work in progress: user authentication
stash@{1}: WIP on main: 2f8a9b1 Fix navigation bug
stash@{2}: On hotfix: Emergency database connection fix

# Apply most recent stash (keeps stash in list)
git stash apply

# Apply specific stash by index
git stash apply stash@{1}

# Apply and remove stash (most common)
git stash pop

# Pop specific stash
git stash pop stash@{0}

# Stash only specific files
git stash push -m "Style updates" src/styles.css src/layout.css

# Stash everything except specific files
git stash push -m "All except config" -- . ':!config/settings.js'

# Interactive stashing (choose hunks)
git stash push -p -m "Partial feature implementation"

# Include untracked files in stash
git stash push -u -m "Include new files"
# or
git stash push --include-untracked -m "With new files"

# Include everything (tracked, untracked, and ignored)
git stash push -a -m "Complete workspace snapshot"
# or
git stash push --all -m "Everything included"

# Stash only staged changes, keep unstaged changes
git stash push --staged -m "Only staged changes"

# Keep staged changes, stash unstaged changes
git stash push --keep-index -m "Keep staged, stash unstaged"

# Create multiple named stashes
git stash push -m "Feature A: halfway done"
git stash push -m "Feature B: needs testing"
git stash push -m "Bugfix: temporary solution"

# View stash contents without applying
git stash show stash@{0}

# View detailed diff of stash
git stash show -p stash@{1}

# View stash summary
git stash show --stat stash@{0}

# Drop (delete) specific stash
git stash drop stash@{1}

# Clear all stashes (use with caution!)
git stash clear

# Create branch from stash
git stash branch new-feature-branch stash@{0}

# Apply stash to different branch
git checkout other-branch
git stash apply stash@{0}

# Scenario: Working on feature when urgent bug reported

# 1. Stash current work
git stash push -m "WIP: user profile feature - 80% complete"

# 2. Switch to main branch
git checkout main

# 3. Create hotfix branch
git checkout -b hotfix/login-error

# 4. Fix the bug and commit
# ... make fixes ...
git add .
git commit -m "fix: resolve login timeout issue"

# 5. Push hotfix
git push -u origin hotfix/login-error

# 6. Return to feature work
git checkout feature/user-profile
git stash pop

# Scenario: Need to review PR while working on feature

# 1. Stash incomplete work
git stash push -m "Feature: payment integration - needs validation"

# 2. Fetch and checkout PR branch for review
git fetch origin pull/123/head:pr-123
git checkout pr-123

# 3. Review, test, and provide feedback
# ... review code ...

# 4. Return to your work
git checkout feature/payment-integration
git stash pop

# Managing multiple features simultaneously

# Work on Feature A
git checkout -b feature/user-dashboard
# ... make changes ...
git stash push -m "Dashboard: basic layout complete"

# Switch to Feature B
git checkout -b feature/email-notifications
# ... make changes ...
git stash push -m "Notifications: email templates done"

# Quick bug fix
git checkout main
# ... fix bug ...
git add . && git commit -m "fix: header alignment"

# Back to Feature A
git checkout feature/user-dashboard
git stash pop  # Resumes dashboard work

# If applying stash creates conflicts
git stash pop
# Auto-merging src/app.js
# CONFLICT (content): Merge conflict in src/app.js

# 1. Resolve conflicts manually
vim src/app.js  # Edit file to resolve conflicts

# 2. Stage resolved files
git add src/app.js

# 3. Note: Stash is automatically dropped after successful pop
# If pop failed, the stash remains in the list
git stash list  # Check if stash still exists

# If you used 'apply' and want to remove the stash after resolving:
git stash drop stash@{0}

# Before applying stash, check for potential conflicts
git stash show -p | git apply --check

# If conflicts expected, create new branch for stash
git stash branch resolve-conflicts stash@{0}

# Apply only specific files from stash
git checkout stash@{0} -- src/utils.js src/helpers.js

# Cherry-pick changes from stash
git stash show -p stash@{0} | git apply --index

# Apply stash without staging changes
git stash show -p | git apply

# View what's in a stash without applying
git stash show stash@{0}          # Summary
git stash show -p stash@{0}       # Full diff
git stash show --stat stash@{0}   # File statistics

# View stash as commit
git show stash@{0}

# View only specific file from stash
git show stash@{0}:path/to/file.js

# Create branch from stash for backup
git stash branch backup-feature-work stash@{0}

# Transfer stash to different repository
git stash show -p stash@{0} > /tmp/mystash.patch
# In other repo:
git apply /tmp/mystash.patch

# Export all stashes
for stash in $(git stash list | cut -d: -f1); do
    git stash show -p $stash > "$stash.patch"
done

# Good stash messages
git stash push -m "WIP: user authentication - 70% complete"
git stash push -m "Feature: shopping cart - needs testing"
git stash push -m "Bugfix: memory leak investigation"
git stash push -m "Experiment: new UI layout approach"

# Poor stash messages
git stash push -m "stuff"
git stash push -m "wip"
git stash push -m "changes"

# Check what Git sees as changes
git status
git diff
git diff --staged

# If you want to stash untracked files:
git stash push -u -m "Include untracked files"

# Check current branch state
git status

# Ensure working directory is clean
git add . && git commit -m "Commit current changes first"
# Then apply stash
git stash pop

# Or apply to different branch
git stash branch temp-branch stash@{0}

# Check reflog for lost stashes
git fsck --unreachable | grep commit | cut -d' ' -f3 | xargs git log --merges --no-walk --grep=WIP

# Or check reflog directly
git log --graph --oneline --all $(git reflog | cut -c1-7)

# Use STASH for:
# - Quick context switches (< 1 hour)
# - Temporary experiments
# - Pulling updates with dirty working directory
# - Emergency interruptions

# Use COMMIT for:
# - Completed features/fixes
# - Checkpoint saves
# - Sharing work with others
# - Long-term storage

# Use BRANCH for:
# - Parallel feature development
# - Long-running experiments
# - Collaborative work
# - Different approaches to same problem

# Daily stash operations
git stash push -m "description"    # Save with message
git stash list                     # View all stashes
git stash pop                      # Apply and remove latest
git stash apply stash@{n}         # Apply specific stash
git stash drop stash@{n}          # Delete specific stash
git stash clear                   # Delete all stashes

# Advanced operations
git stash push -u -m "msg"        # Include untracked files
git stash push -p -m "msg"        # Interactive stashing
git stash show -p stash@{0}       # View stash contents
git stash branch new-branch       # Create branch from stash