revert: add --ff option to allow fast forward when cherry-picking