$ git stash show -p | git apply && git stash drop無理やり解決してる感あるけど、よしhttp://stackoverflow.com/questions/1360712/git-stash-cannot-apply-to-a-dirty-working-tree-please-stage-your-changes