diff options
| author | Elijah Newren <newren@gmail.com> | 2023-01-25 04:03:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-25 17:20:52 (GMT) |
| commit | 1207599e839bd9311ec506d82cd507e820767e9b (patch) | |
| tree | 9ff639d6d6af53691a9c929bcd81b13ec212f42c /Documentation | |
| parent | 56c8fb1e95377900ec9d53c07886022af0a5d3c2 (diff) | |
| download | git-1207599e839bd9311ec506d82cd507e820767e9b.zip git-1207599e839bd9311ec506d82cd507e820767e9b.tar.gz git-1207599e839bd9311ec506d82cd507e820767e9b.tar.bz2 | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index d811c1c..6490bc9 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -630,6 +630,8 @@ start would be overridden by the presence of + If the configuration variable `rebase.updateRefs` is set, then this option can be used to override and disable this setting. ++ +See also INCOMPATIBLE OPTIONS below. INCOMPATIBLE OPTIONS -------------------- |