tools/batch-rebase: Fix cherry picking in some scenarios

FIX

Sometimes cherry-picking of an entire range fails where cherry picking each commit individually works, so do that instead.