rebase -i: use new --ff cherry-pick option