fixup! rebase -i: Teach do_pick the option --edit
squash! rebase -i: Make option handling in pick_one more flexible