Heya,
I have switched to using next/ recently and have had the chance to try out the new '--keep-index' option to 'git stash'. I must say that 'git stash save --keep-index' in combination with 'git add -p' followed by 'e' allows for a really nice workflow where I can split up patches very easily, and test them before committing anything. IIUC the '--keep-index' option was added as a response to the request to support a workflow something like this: <hack hack hack> $ git add # or -i / -p $ git stash save --keep-index <test if staged changes are ready to be commited> $ git commit $ git stash pop <lather, rinse, repeat>
But what happens if in the testing phase you detect that the commit is not ready yet, or even, some of the changes you staged should have been kept? It would make sense to 'undo' the stash the usual way: $ git stash pop But alas, it is not possible to apply on a dirty working directory, so one has to resort to: $ git commit -m "tmp" $ git stash pop $ git reset HEAD^ Nothing too bad surely, but I thought that the '--keep-index' option was exactly to prevent having to do: <hack hack hack> $ git add # or -i / -p $ git commit -m "tmp" $ git stash save <test if now committed changes were indeed ready to be comitted> So the '--keep-index' option eliminates the need for such a temporary commit in the (hopefully) common case where the selected changes were indeed good, but we still need it in the case that the changes were not ready / need something from the stashed changes.
Am I missing something here? Or is the only/best solution here to just alias 'git commit -m "tmp" && git stash pop && git reset HEAD^' to 'git undo-stash'?
PS: It'd be nice if I could do 'git stash --keep-index' since I"m used to 'git stash' automagically defaulting to 'git stash save'.
-- Cheers, Sverre Rabbelier
