Comprehensive Guide to Git Stash Recovery: From Basic Application to Advanced Scenarios

Fundamental Recovery Mechanisms

The core functionality of Git stash involves temporarily storing uncommitted changes for subsequent recovery. The most basic recovery command is git stash apply, which applies the most recent stash to the current working directory while preserving the stash record for future use.

# View current stash list
git stash list
# Apply latest stash
git stash apply
# Verify application results
git diff

Compared to git stash pop, the apply command offers greater flexibility by retaining stash records, particularly when adjustments are needed or application to different branches is required. After verification, manually remove the stash using git stash drop.

Stash Stack Management

Git stash employs a stack structure to manage multiple stashed records, with the most recent stash as stash@{0}, the next as stash@{1}, and so forth. Specific stashes can be precisely applied by specifying their indices.

# Apply specific stash
git stash apply stash@{2}
# Drop specific stash
git stash drop stash@{1}

As the number of stashes increases, management complexity rises. Consider creating branches for important stashes to leverage the semantic benefits of branch names for improved maintainability.

Index State Restoration

Git stash preserves not only working directory changes but also staging area status. The --index parameter restores the original staging configuration.

# Restore including staging area status
git stash apply --index

When the working directory contains existing changes, --index may cause conflicts. Consider committing current changes or creating temporary branches to ensure a clean working directory before applying stashes.

Complex Scenario Handling

When branches have significantly diverged from the stash creation point, direct application may fail. In such cases, git stash branch provides a reliable solution.

# Create new branch based on stash
git stash branch new-feature-branch

This command automatically switches to the commit point when the stash was created, establishes a new branch, and applies the stash, ensuring complete recovery of changes.

Multiple Stash Sequential Application

Multiple stashes can be applied in specific sequences, with each application operation essentially performing a Git merge process.

# Apply multiple stashes in sequence
git stash apply stash@{0}
git stash apply stash@{1}

It's recommended to perform such operations in a clean working directory, facilitating reversion to the initial state using git reset --hard if needed.

Stash Content Inspection

Stash contents can be previewed before application to understand specific changes.

# View detailed stash differences
git stash show -p stash@{0}

This command displays a summary of working directory changes, excluding staging area status differences.

Recovery Strategy Summary

Different scenarios warrant specific recovery strategies: use git stash apply for simple change relocation; add the --index parameter when preserving staging status is necessary; employ git stash branch for complex branching situations; manage multiple stashes through precise index specification. Maintaining a clean working directory consistently significantly reduces conflict risks and enhances recovery operation success rates.