]> git.ipfire.org Git - thirdparty/git.git/commit
rebase.c: state preserve-merges has been removed
authorPhilip Oakley <philipoakley@iee.email>
Sat, 4 Jun 2022 11:17:46 +0000 (11:17 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Jun 2022 17:45:54 +0000 (10:45 -0700)
commit2f7b9f9e55ca2d8fa23fe44678a0180f7e118c86
treed2eca0b6cbc864d7df9eb4bdb68fd152fb394a5c
parente54793a95afeea1e10de1e5ad7eab914e7416250
rebase.c: state preserve-merges has been removed

Since feebd2d256 (rebase: hide --preserve-merges option, 2019-10-18)
this option is now removed as stated in the subsequent release notes.

Fix and reflow the option tip.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c