| commit | 1207599e839bd9311ec506d82cd507e820767e9b | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 25 Jan 2023 04:03:45 +0000 (25 04:03 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jan 2023 17:20:52 +0000 (25 09:20 -0800) | ||
| tree | 9ff639d6d6af53691a9c929bcd81b13ec212f42c | treesnapshot (tar.gz zip) |
| parent | 56c8fb1e95377900ec9d53c07886022af0a5d3c2 | commitdiff |
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>
--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>
| Documentation/git-rebase.txt | diffblobblamehistory | |
| builtin/rebase.c | diffblobblamehistory | |
| t/t3422-rebase-incompatible-options.sh | diffblobblamehistory |