]> git.ipfire.org Git - thirdparty/git.git/commit - contrib/completion/git-completion.bash
pull: remove support for `--rebase=preserve`
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 7 Sep 2021 21:05:05 +0000 (21:05 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2021 04:45:32 +0000 (21:45 -0700)
commit52f1e82178e75bdf876799770922bc34fdf6fae4
tree5bf0fbafadb750ab5f5d9d3eebdd28c50f8333fd
parentaa4df107e72a7a8bd2f149ecb58edfe9dde8576b
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>
Documentation/config/branch.txt
Documentation/config/pull.txt
Documentation/git-pull.txt
builtin/pull.c
contrib/completion/git-completion.bash
rebase.c
rebase.h