tree b267a8d64b0b04625931d6e334310b9227829ba4
parent d9f6f3b6195a0ca35642561e530798ad1469bd41
author Johannes Schindelin <johannes.schindelin@gmx.de> 1574463569 +0000
committer Junio C Hamano <gitster@pobox.com> 1574470163 +0900

git svn: stop using `rebase --preserve-merges`

We deprecated `--preserve-merges` in favor of `--rebase-merges`; Let's
reflect that in `git svn`.

Note: Even when the user asks for `--preserve-merges`, we now silently
pass `--rebase-merges` to `git rebase` instead. Technically, this is a
change of behavior. But practically, `git svn` only ever asks for a
non-interactive rebase, and `--preserve-merges` and `--rebase-merges`
are on par with regard to that.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Acked-by: Eric Wong <e@80x24.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>