In regards to stash, yes, loss is problematic, but one can simulate it by saving the diff to a file:
git diff > my-stash.diff
Then you can even commit these if you like, or copy them to a safer directory. Applying them is just an invocation of `patch`.