From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Sep 2013 22:00:56 +0000 (-0700)
Subject: Merge branch 'rt/rebase-p-no-merge-summary'
X-Git-Tag: v1.8.5-rc0~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c731e9c8f92b138c31a0897321a2578ba9221e5;p=thirdparty%2Fgit.git

Merge branch 'rt/rebase-p-no-merge-summary'

"git rebase -p" internally used the merge machinery, but when
rebasing, there should not be a need for merge summary.

* rt/rebase-p-no-merge-summary:
  rebase --preserve-merges: ignore "merge.log" config
---

8c731e9c8f92b138c31a0897321a2578ba9221e5