On Mon, Dec 16, 2019 at 02:32:31PM +0000, Chrissy Wainwright wrote: > Thank you, using --index does work! Now the trick is to actually > remember to use it in this case, since it doesn't seem the change can > be restored if you forget to use it the first time you pop/apply. I think this is a spot where git-stash could be a little friendlier. If you've stashed index changes and "git stash pop", then those index changes are not applied but get thrown away, losing information. It would be nicer if "stash pop" noticed that there are entries in the stashed index that do not match HEAD or the stashed working tree, and applied as requested but _didn't_ remove the stash (with a message that you can get your index changes out with "--keep-index"). Maybe a good small project for somebody looking to get their feet wet with contributing to Git (you, or anybody else reading this). -Peff
