Git Stash, Worktree, and Clean Cheat Sheet

git stash push -m "WIP before review"

# Save tracked changes with a message.

git stash push --keep-index -m "stash unstaged only"

# Keep staged changes in the index and stash the rest.

git stash push -m "stash selected files" -- path/to/file another/file

# Temporarily save changes from selected files.

git stash list --stat

# See stash entries and a compact summary of their changes.

git stash show -p stash@{0}

# Inspect the actual diff stored in a stash entry.

git stash branch recovered-wip stash@{0}

# Check out a new branch and apply a stash there.

git worktree list

# Show all linked working trees for the repository.

git worktree add --detach ../investigation <commit_sha>

# Check out a specific commit in a new working tree.

git worktree add -b hotfix ../hotfix

# Add a worktree and create a new branch from current HEAD.

git worktree lock ../feature --reason "USB drive worktree"

# Prevent a worktree from being pruned or accidentally removed.

git worktree prune

# Clean up references to missing worktree directories.

git worktree remove --force ../feature

# Delete a linked worktree entry and directory.

git clean -n

# Dry-run a cleanup of untracked files.

git clean -f

# Remove untracked files from the working tree.

git clean -fd

# Remove untracked files and directories.

git clean -fdx

# Remove ignored and untracked files and directories.

git clean -i

# Review and select files to remove interactively.

git config --global rerere.enabled true

# Record and reuse conflict resolutions automatically.

git rerere diff

# Inspect what rerere has recorded for conflict resolutions.

git rerere clear

# Remove recorded conflict-resolution data.