Revert "rebase -i: Make option handling in pick_one more flexible"

This reverts commit 0570d4b81728ec5bc1b2ec953b2a1c0d0367f824.

Conflicts:
	git-rebase--interactive.sh