Add cherry-pick and rebase aliases with options