Merge branch 'rt/rebase-p-no-merge-summary'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Sep 2013 22:00:56 +0000 (11 15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Sep 2013 22:00:56 +0000 (11 15:00 -0700)
"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

1  2 
git-rebase--interactive.sh

Simple merge