I picked up my git workflow from a very commit-centric workplace.

Instead of stashing or anything like that we would commit with the text "WIP". Every time we had a stable point, we would make a "WIP" commit and then continue, giving us a good point to revert to if the next steps don't work.

If someone interrupts me I would make a WIP commit and then revert it and then make the change they're asking about.

Later on we would squash the WIP commits and make real commits out of the changes.

Another nice thing about this workflow is that everything goes into the reflog.