I agree, these are the only times I've irreversibly gotten myself into trouble. I think it would be possible to solve these with git, by doing something like a

I agree, these are the only times I've irreversibly gotten myself into trouble. I think it would be possible to solve these with git, by doing something like automatically running a `git stash --include-untracked` before an operation that can clobber untracked files.