From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Oct 2013 22:45:45 +0000 (-0700)
Subject: Merge branch 'rt/rebase-p-no-merge-summary' into maint
X-Git-Tag: v1.8.4.2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a3a02b605ae58f5d61e48f213cf11bef3379739;p=thirdparty%2Fgit.git

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

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

9a3a02b605ae58f5d61e48f213cf11bef3379739