From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jun 2018 20:22:39 +0000 (-0700)
Subject: Merge branch 'ag/rebase-p'
X-Git-Tag: v2.19.0-rc0~186
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3fec40e8d8798e5313f05a9273aef932fe4519e;p=thirdparty%2Fgit.git

Merge branch 'ag/rebase-p'

Separate "rebase -p" codepath out of "rebase -i" implementation to
slim down the latter and make it easier to manage.

* ag/rebase-p:
  rebase: remove -p code from git-rebase--interactive.sh
  rebase: use the new git-rebase--preserve-merges.sh
  rebase: strip unused code in git-rebase--preserve-merges.sh
  rebase: introduce a dedicated backend for --preserve-merges
---

f3fec40e8d8798e5313f05a9273aef932fe4519e