tree 5bf0fbafadb750ab5f5d9d3eebdd28c50f8333fd
parent aa4df107e72a7a8bd2f149ecb58edfe9dde8576b
author Johannes Schindelin <johannes.schindelin@gmx.de> 1631048705 +0000
committer Junio C Hamano <gitster@pobox.com> 1631076332 -0700

pull: remove support for `--rebase=preserve`

In preparation for `git-rebase--preserve-merges.sh` entering its after
life, we remove this (deprecated) option that would still rely on it.

To help users transition who still did not receive the memo about the
deprecation, we offer a helpful error message instead of throwing our
hands in the air and saying that we don't know that option, never heard
of it.

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>