From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Sep 2016 23:49:38 +0000 (-0700)
Subject: Merge branch 'jk/patch-ids-no-merges' into maint
X-Git-Tag: v2.10.1~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35ca3e538d2e36c528ff5382a0e3cca35b46c6ed;p=thirdparty%2Fgit.git

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

"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
---

35ca3e538d2e36c528ff5382a0e3cca35b46c6ed