completion: merge options for cherry-pick and revert