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 /.gitignore | |
| parent | 52f1e82178e75bdf876799770922bc34fdf6fae4 (diff) | |
| download | git-a74b35081c51adbde3ef01870ba03e859db33be6.tar.gz | |
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 '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 311841f9be..98d6275b20 100644 --- a/.gitignore +++ b/.gitignore @@ -125,7 +125,6 @@ /git-range-diff /git-read-tree /git-rebase -/git-rebase--preserve-merges /git-receive-pack /git-reflog /git-remote |