| commit | f0a84de2770361d21115f6768b2c4746519dbf62 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Sep 2016 22:15:20 +0000 (21 15:15 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Sep 2016 22:15:20 +0000 (21 15:15 -0700) | ||
| tree | dec7295b7e12d249fd4f2e1366ce6b454752f70f | treesnapshot (tar.gz zip) |
| parent | 13307145a97c7028403801fc4ead26bff794cead | commitdiff |
| parent | 7c8104079239bb52380e32a11a686665fc16d040 | commitdiff |
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
"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