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

diff --cc git-rebase--interactive.sh
Simple merge