]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/git-svn-use-rebase-merges'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2019 20:52:46 +0000 (12:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2019 20:52:46 +0000 (12:52 -0800)
Prepare further for "rebase --preserve-merges" deprecation.

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


Trivial merge