fix cherry-pick alias