revert: allow cherry-pick --continue to commit before resuming