cherry-pick: handle root commits with external strategies