Merge branch 'js/git-svn-use-rebase-merges'
commit75bd003c7b8df862fd38f1e2cfb82b545d49a9e6
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2019 20:52:46 +0000 (5 12:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2019 20:52:46 +0000 (5 12:52 -0800)
treed3d2bf4d8b400649fa8ba88a0f0100f030f32482
parentf06dff7b7c1cfd273f2e23cfee547c0f05f76e31
parentea8b7be1476a2301e3658a8e626b69c9d7f540bd
Merge branch 'js/git-svn-use-rebase-merges'

Prepare further for "rebase --preserve-merges" deprecation.

* js/git-svn-use-rebase-merges:
  git svn: stop using `rebase --preserve-merges`