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

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

Junio C Hamano committed Oct 17, 2013 at 15:45 UTC 9a3a02b605ae58f5d61e48f213cf11bef3379739

No changes.