diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2021-09-07 21:05:06 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-09-07 21:45:33 -0700 |
| commit | a74b35081c51adbde3ef01870ba03e859db33be6 (patch) | |
| tree | ccb852f30a1fecea4406dd62cec5ee81600eaa43 /diffcore-delta.c | |
| parent | pull: remove support for `--rebase=preserve` (diff) | |
| download | tgif-a74b35081c51adbde3ef01870ba03e859db33be6.tar.xz | |
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>
Diffstat (limited to 'diffcore-delta.c')
0 files changed, 0 insertions, 0 deletions