]> git.ipfire.org Git - thirdparty/git.git/commit
rebase: drop support for `--preserve-merges`
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 7 Sep 2021 21:05:06 +0000 (21:05 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2021 04:45:33 +0000 (21:45 -0700)
commita74b35081c51adbde3ef01870ba03e859db33be6
treeccb852f30a1fecea4406dd62cec5ee81600eaa43
parent52f1e82178e75bdf876799770922bc34fdf6fae4
rebase: drop support for `--preserve-merges`

This option was deprecated in favor of `--rebase-merges` some time ago,
and now we retire it.

To assist users to transition away, we do not _actually_ remove the
option, but now we no longer implement the functionality. Instead, we
offer a helpful error message suggesting which option to use.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
.gitignore
Documentation/git-rebase.txt
Makefile
builtin/rebase.c
git-rebase--preserve-merges.sh [deleted file]