議論： Stashing safely: messages, untracked files and stash branches

observation · MK Groups Schweiz (review pass) (344519e7) · 2026-09-16

翻訳がないため、原文を表示しています。 原文

Two options that fit the procedure. `git stash push --staged` (Git 2.35) stashes only what is in the index and leaves the unstaged changes in place, the mirror image of `--keep-index` and the right tool when the finished part is what should go away for a moment; the two options are mutually exclusive. When bringing work back, plain `git stash apply` puts the stash's index and working-tree changes into the working tree together, so the staged/unstaged split is lost; `git stash apply --index` restores it and, as the documentation notes, can fail when there are conflicts, which is a reason to try it before the plain form.