How do I view multiple stashes?

You can use 'git stash list' to view multiple stashes. You can create multiple stashes by running git stash several times, and each stash is identified as a 'WIP' (work in progress) on top of the branch and commit that you created the stash from.

What happens when there are conflicts while applying a stash?

If the changes on your branch diverge from the changes in your stash, you may encounter conflicts when popping or applying your stash. In such cases, you can use 'git stash branch' to create a new branch to apply your stashed changes to.

What happens to untracked files when using git stash?

When used with the push and save commands, all untracked files are stashed and then cleaned up with git clean. This means both ignored and untracked files are included in the stash.

Stash

WebsiteFree TrialAI Developer Tools AI Knowledge Management

Stash is a powerful issue resolution assistant for developers that provides instant context and solutions by analyzing tickets and questions while seamlessly integrating with existing development tools and AI platforms.

ウェブサイトを訪問

このツールを宣伝する

https://www.usestash.com/?ref=producthunt

概要
動画
代替案

製品情報

更新日:2025年09月19日

Stashとは

Stash is a comprehensive development tool designed to help developers find solutions and context quickly without disrupting their workflow. It acts as a central knowledge hub that connects with popular development platforms like GitHub, GitLab, Jira, and AI assistants like GitHub Copilot and Claude. The platform aims to eliminate time spent searching for information by providing instant access to relevant documentation, similar past issues, code locations, and expert recommendations when developers encounter problems.

Stashの主な機能

Git stash is a powerful feature that allows developers to temporarily save uncommitted changes to a stack and revert their working directory to match HEAD. This enables developers to switch contexts, pull upstream changes, or work on different tasks without committing incomplete work. The changes can later be reapplied using git stash pop or git stash apply commands.

Temporary Storage: Saves uncommitted changes (both staged and unstaged) to a stash stack without requiring a commit

Multiple Stash Support: Allows creating and managing multiple stashes with git stash list to view and reference them

Flexible Application: Provides options to reapply stashed changes using pop (removes from stash) or apply (keeps in stash) commands

Branch Creation: Enables creating new branches from stashed changes using git stash branch to resolve conflicts

Stashのユースケース

Context Switching: When needing to quickly switch to another branch to fix a bug or work on a different feature without committing current work

Upstream Changes: Temporarily storing local changes to pull and merge updates from the remote repository without conflicts

Work in Progress Save: Saving incomplete work before leaving for the day or switching tasks, without creating unnecessary commits

メリット

Simple and fast way to temporarily store changes

Works with both staged and unstaged changes

Supports multiple stashes with descriptive messages

デメリット

Changes are only stored locally and not shared with team

Can lead to lost work if stashes are forgotten or mismanaged

May face conflicts when reapplying stashed changes

Stashの使い方

Basic Stashing: Use 'git stash' to temporarily save uncommitted changes and revert working directory to match HEAD. This stores both staged and unstaged changes.

Stash with Message: Use 'git stash save "description"' to stash changes with a descriptive message to help identify the stash later.

Include Untracked Files: Use 'git stash -u' or 'git stash --include-untracked' to also stash untracked files along with tracked changes.

View Stash List: Use 'git stash list' to see all stashes. Each stash is identified by stash@{n} where n is the index number.

Apply Stash: Use 'git stash apply' to apply most recent stash or 'git stash apply stash@{n}' to apply a specific stash. This keeps the stash in the list.

Pop Stash: Use 'git stash pop' to apply and remove most recent stash or 'git stash pop stash@{n}' for specific stash. This removes the stash after applying.

Create Branch from Stash: Use 'git stash branch <branchname>' to create a new branch from a stash when there are conflicts with current branch.

Drop Stash: Use 'git stash drop stash@{n}' to delete a specific stash or 'git stash clear' to remove all stashes.

Stashのよくある質問

Git stash is a command that temporarily shelves or saves changes you've made to your working copy so you can switch to something else, and then come back and re-apply the changes later. It takes your uncommitted changes (both staged and unstaged) and saves them away for future use.