tree 9ff639d6d6af53691a9c929bcd81b13ec212f42c
parent 56c8fb1e95377900ec9d53c07886022af0a5d3c2
author Elijah Newren <newren@gmail.com> 1674619425 +0000
committer Junio C Hamano <gitster@pobox.com> 1674667252 -0800

rebase: mark --update-refs as requiring the merge backend

--update-refs is built in terms of the sequencer, which requires the
merge backend.  It was already marked as incompatible with the apply
backend in the git-rebase manual, but the code didn't check for this
incompatibility and warn the user.  Check and error now.

While at it, fix a typo in t3422...and fix some misleading wording
(most options which used to be am-specific have since been implemented
in the merge backend as well).

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>