diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-21 15:15:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-21 15:15:20 -0700 |
| commit | f0a84de2770361d21115f6768b2c4746519dbf62 (patch) | |
| tree | dec7295b7e12d249fd4f2e1366ce6b454752f70f /zlib.c | |
| parent | Merge branch 'jk/delta-base-cache' (diff) | |
| parent | patch-ids: refuse to compute patch-id for merge commit (diff) | |
| download | tgif-f0a84de2770361d21115f6768b2c4746519dbf62.tar.xz | |
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
Diffstat (limited to 'zlib.c')
0 files changed, 0 insertions, 0 deletions