summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-01-25 04:03:48 +0000
committerJunio C Hamano <gitster@pobox.com>2023-01-25 09:20:53 -0800
commitb8ad365640192706e6742f47302e69e7aea62faf (patch)
tree1cf46c07c6146bedfa1ede1d43a9b9b92bf4dbca /commit.c
parent1a66d8c6f658051a02b6d8f024e80e06fccdcd11 (diff)
rebase: fix docs about incompatibilities with --root
In commit 5dacd4abdd ("git-rebase.txt: document incompatible options", 2018-06-25), I added notes about incompatibilities between options for the apply and merge backends. Unfortunately, I inverted the condition when --root was incompatible with the apply backend. Fix the documentation, and add a testcase that verifies the documentation matches the code. While at it, the documentation for --root also tried to cover some of the backend differences between the apply and merge backends in relation to reapplying cherry picks. The information: * assumed that the apply backend was the default (it isn't anymore) * was written before --reapply-cherry-picks became an option * was written before the detailed information on backend differences All of these factors make the sentence under --root about reapplying cherry picks contradict information that is now available elsewhere in the manual, and the other references are correct. So just strike this sentence. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions