Johannes Schindelin 52f1e82178 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>		2021-09-07 21:45:32 -07:00
..
.gitattributes	completion: mark bash script as LF-only	2017-05-10 13:32:51 +09:00
git-completion.bash	pull: remove support for --rebase=preserve	2021-09-07 21:45:32 -07:00
git-completion.tcsh	git-completion.tcsh: fix redirect with noclobber	2015-06-09 11:21:15 -07:00
git-completion.zsh	contrib/completion: fix zsh completion regression from 59d85a2a05	2021-06-02 12:49:40 +09:00
git-prompt.sh	git-prompt: work under set -u	2021-05-13 15:50:26 +09:00