Changes that survived the git stash