diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2021-09-07 23:05:05 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-08 06:45:32 +0200 |
| commit | 52f1e82178e75bdf876799770922bc34fdf6fae4 (patch) | |
| tree | 5bf0fbafadb750ab5f5d9d3eebdd28c50f8333fd /contrib/completion | |
| parent | tests: stop testing `git rebase --preserve-merges` (diff) | |
| download | git-52f1e82178e75bdf876799770922bc34fdf6fae4.tar.xz git-52f1e82178e75bdf876799770922bc34fdf6fae4.zip | |
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>
Diffstat (limited to 'contrib/completion')
| -rw-r--r-- | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 4bdd27ddc8..5dab8bd579 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2543,7 +2543,7 @@ __git_complete_config_variable_value () return ;; branch.*.rebase) - __gitcomp "false true merges preserve interactive" "" "$cur_" + __gitcomp "false true merges interactive" "" "$cur_" return ;; remote.pushdefault) |