| commit | 35ca3e538d2e36c528ff5382a0e3cca35b46c6ed | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 29 Sep 2016 23:49:38 +0000 (29 16:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 29 Sep 2016 23:49:38 +0000 (29 16:49 -0700) | ||
| tree | aa74aa79c8c4c9510eacce8747e80a3454a30e2e | treesnapshot (tar.gz zip) |
| parent | d7e74c940b9a2f9a8d1c5bfb1c7df5591afb9666 | commitdiff |
| parent | 7c8104079239bb52380e32a11a686665fc16d040 | commitdiff |
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
"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