A few comments. I think git-stash could be used now that it's available.