Hello, I've always missed a way to do what `bzr shelve` does: interactive stash, where you just select hunks à-la `add -p`, and then those gets stashed away. I've recently realized that git-stash doesn't need to know how to prompt for changes, and that just a --from-index flag that would stash the state of the index would be simpler and (at least in my eyes) very git-ish. Do you think such a flag would be appropriate? I've prepared a preliminary, but I need help with the part that removes the index changes from the working tree (a partial git-reset --hard). I know "checkout stash && checkout -" would do it, but I really don't know how to do that with low-level plumbing (unless git-checkout is actually okay for this.) Any suggestions? Additionally, I have two behaviors I'd like in stash: the ability to apply/pop on top of a dirty state, perhaps with a -f flag (at the moment I'm just doing `commit -a -m foo && pop && reset HEAD^`), and the ability to --amend the last stash state, as in "oh, add this to the last stash please". Thoughts? Many thanks in advance, -- Adeodato Simó dato at net.com.org.es Debian Developer adeodato at debian.org When all is summed up, a man never speaks of himself without loss; his accusations of himself are always believed; his praises never. -- Michel de Montaigne