fixup! pull: require choice between rebase/merge on non-fast-forward pull

Signed-off-by: Junio C Hamano <gitster@pobox.com>