Stash | Tools - Wyatt's Notes

flowchart TD
    A[02 Stash] --> B[Key Concepts]
    A --> C[Core Principles]
    A --> D[Practical Applications]
    B --> E[Fundamental definitions]
    C --> F[Design patterns]
    D --> G[Real-world usage]

git stash temporarily shelves changes in your working directory and index, restoring your repository to a clean state (matching HEAD). It is a stack-based mechanism, you can push multiple stashes and pop them in LIFO order.

• Switching branches with uncommitted work you cannot commit yet.
• Pulling remote changes that conflict with your local work.
• Running a quick test on a clean working directory.
• Context-switching between tasks.

git stash                    # Stash all modified tracked files
git stash -u                 # Stash including untracked files
git stash -m "WIP: auth"     # Stash with a descriptive message
git stash list               # Show all stashes
git stash pop                # Apply and remove most recent stash
git stash apply              # Apply without removing
git stash drop               # Remove most recent stash
git stash clear              # Remove all stashes
git stash show -p            # Show diff of most recent stash

1. Forgetting stash is branch-specific: Stashes live in the repository, not on a branch. You can apply a stash from any branch, but merge conflicts may arise if the working tree has diverged.
2. Stashing dirty state: Stash only saves tracked file changes. Untracked files require git stash -u. New files added after a stash are not captured.
3. Losing stashes: git stash clear is destructive and irreversible. Use git stash list before clearing to verify what you are discarding.

git stash temporarily shelves changes in your working directory, restoring the repository to a clean state matching HEAD. It uses a stack-based mechanism (LIFO order) for multiple stashes. Key commands include git stash (create), git stash pop (apply and remove), git stash apply (apply without removing), and git stash list (show all stashes). Use -u to include untracked files and -m for descriptive messages. Stashes are stored in the repository, not on a branch, so they can be applied from any branch but may cause merge conflicts if the working tree has diverged.

You are working on feature A but need to fix a bug on main.

git stash -m "WIP: feature A"
git checkout main
# fix the bug, commit, push
git checkout feature-branch
git stash pop

You have new files that are not yet tracked by Git.

git stash -u -m "Include new files"
# Now working directory is clean, including untracked files
git stash pop

• Git Fundamentals - Basic Git commands
• Git Branching - Branch management

This section provides detailed coverage of advanced concepts, including full derivations, proofs, and extended examples.

Complete mathematical derivations and proofs are provided where appropriate. Each step is explained to ensure understanding of the underlying reasoning.

Advanced examples demonstrate the application of concepts to complex problems. These examples go beyond standard exam questions to develop deeper understanding.

This material connects to current research and advanced applications in the field. Understanding these connections provides context for the study material.

Ensure you have mastered the prerequisite material before attempting this advanced content.