From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Dec 2019 20:52:46 +0000 (-0800)
Subject: Merge branch 'js/git-svn-use-rebase-merges'
X-Git-Tag: v2.25.0-rc0~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75bd003c7b8df862fd38f1e2cfb82b545d49a9e6;p=thirdparty%2Fgit.git

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`
---

75bd003c7b8df862fd38f1e2cfb82b545d49a9e6