From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Sep 2016 22:15:20 +0000 (-0700)
Subject: Merge branch 'jk/patch-ids-no-merges'
X-Git-Tag: v2.11.0-rc0~135
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=f0a84de2770361d21115f6768b2c4746519dbf62;p=git.git

Merge branch 'jk/patch-ids-no-merges'

"git log --cherry-pick" used to include merge commits as candidates
to be matched up with other commits, resulting a lot of wasted time.
The patch-id generation logic has been updated to ignore merges to
avoid the wastage.

* jk/patch-ids-no-merges:
  patch-ids: refuse to compute patch-id for merge commit
  patch-ids: turn off rename detection
---

f0a84de2770361d21115f6768b2c4746519dbf62