]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1330714 7c81040)
Merge branch 'jk/patch-ids-no-merges'
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Sep 2016 22:15:20 +0000 (15:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Sep 2016 22:15:20 +0000 (15:15 -0700)
commitf0a84de2770361d21115f6768b2c4746519dbf62
treedec7295b7e12d249fd4f2e1366ce6b454752f70ftree | snapshot
parent13307145a97c7028403801fc4ead26bff794ceadcommit | diff
parent7c8104079239bb52380e32a11a686665fc16d040commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.