Files
git/Documentation
Johannes Schindelin 0a159d65d6 git-svn: drop support for --preserve-merges
We already passed the `--rebase-merges` option to `git rebase` instead,
now we make this move permanent.

As pointed out by Ævar Arnfjörð Bjarmason, in contrast to the
deprecation of `git rebase`'s `--preserve-merges` backend, `git svn`
only deprecated this option in v2.25.0 (because this developer missed
`git svn`'s use of that backend when deprecating the rebase backend
running up to Git v2.22).

Still, v2.25.0 has been released on January 13th, 2020. In other words,
`git svn` deprecated this option over one and a half years ago, _and_
has been redirecting to the `--rebase-merges` option during all that
time (read: `git svn rebase --preserve-merges` didn't do _precisely_
what the user asked, since v2.25.0, anyway, it fell back to pretending
that the user asked for `git svn rebase --rebase-merges` instead).

It is time to act on that deprecation and remove that option after all.

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:33 -07:00
..
2021-08-16 12:15:44 -07:00
2021-07-08 13:14:59 -07:00
2019-05-09 00:37:27 +09:00
2020-08-04 18:34:02 -07:00
2020-09-19 15:56:06 -07:00
2021-04-08 14:18:03 -07:00
2019-01-23 11:37:29 -08:00
2019-05-07 13:04:48 +09:00
2021-05-24 18:08:22 +09:00
2021-05-16 21:05:24 +09:00
2019-10-21 12:02:39 +09:00