fixed --skip, removed --branch-only