bashANYgitstashworkflow
bash
git stash push -m "WIP before review"Messages make stash history much easier to understand in long-running repositories.
Git Stash, Worktree, and Clean Cheat Sheet
Temporary work preservation, multi-worktree workflows, cleanup commands, and conflict-resolution reuse.
Export
Copy the compact sheet, download it, or print it.
Download
`D` dense toggle · `C` copy all
Stash Workflows
Save, inspect, apply, branch from, and manage stashes.
bashANYgitstashindex
bash
git stash push --keep-index -m "stash unstaged only"Useful when you want to test or commit only what is staged while setting aside unrelated work.
bashANYgitstashpathspec
bash
git stash push -m "stash selected files" -- path/to/file another/fileAdvanced stash usage for partial working tree preservation.
bashANYgitstashinspect
bash
git stash list --statHelpful when you have many stashes and need a quick overview of their scope.
bashANYgitstashpatchinspect
bash
git stash show -p stash@{0}Useful before applying or branching from an older stash.
bashANYgitstashbranchrecovery
bash
git stash branch recovered-wip stash@{0}Very useful when a stash no longer applies cleanly on the current branch but should become dedicated work.
Worktree Workflows
Maintain multiple working directories from one repository.
bashANYgitworktreeinspect
bash
git worktree listThe first command to run when managing multiple checkouts from the same repository.
bashANYgitworktreedetached-head
bash
git worktree add --detach ../investigation <commit_sha>Useful for quick historical investigation without disturbing active branches.
bashANYgitworktreebranch
bash
git worktree add -b hotfix ../hotfixA fast way to spin up a new isolated working directory for urgent work.
bashANYgitworktreelock
bash
git worktree lock ../feature --reason "USB drive worktree"Useful when the worktree lives on a removable or temporarily unavailable path.
bashANYgitworktreeprunemaintenance
bash
git worktree pruneHelpful after manually deleting worktree directories outside Git.
bashANYgitworktreeremovedanger
bash
git worktree remove --force ../featureUse `--force` only when the worktree has local changes or other blockers and you intentionally want it removed.
Clean and Temporary File Management
Remove untracked files safely and recover from build clutter.
bashANYgitcleanpreview
bash
git clean -nAlways preview before cleaning. This is the safest habit for `git clean`.
bashANYgitcleanuntracked
bash
git clean -fDeletes untracked files only, not directories or ignored files.
bashANYgitcleandirectories
bash
git clean -fdCommon when resetting a repository after generated build artifacts and local temp directories.
bashANYgitcleanignoreddanger
bash
git clean -fdxVery destructive in projects with ignored local configs or build outputs. Use carefully.
bashANYgitcleaninteractive
bash
git clean -iSafer than force-cleaning when you want more control over what gets removed.
Rerere and Repeated Conflict Resolution
Record and reuse conflict resolutions across merges and rebases.
bashANYgitrerereconflictsmerge
bash
git config --global rerere.enabled trueExcellent for repeated rebases, repeated cherry-picks, or long-running branches that see the same conflict patterns.
bashANYgitrererediff
bash
git rerere diffUseful when verifying that rerere recorded the intended resolution.
bashANYgitrerereclear
bash
git rerere clearHelpful if rerere recorded an incorrect or unwanted resolution pattern.
More in Git Advanced
Git Bisect, Cherry-pick, and Submodule Cheat Sheet
Advanced workflows for regression hunting, selective commit transfer, and repository dependency management.
Git Reset, Revert, and Restore Cheat Sheet
Understand the differences between reset, revert, and restore and use the right recovery command safely.
Git Reflog and Recovery Cheat Sheet
Recover commits, branches, and work after resets, rebases, deletes, and mistaken force updates.
Git Rebase Cheat Sheet
Advanced rebase commands, interactive workflows, conflict handling, and branch-transplant patterns.
Git Advanced Cheat Sheet
Advanced Git commands and workflows for rewriting history, recovering commits, debugging regressions, working with multiple trees, and maintaining repositories.