What could be simpler than "$ git stash" and "$ git stash pop" ?