diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:49:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:49:38 -0700 |
| commit | 35ca3e538d2e36c528ff5382a0e3cca35b46c6ed (patch) | |
| tree | aa74aa79c8c4c9510eacce8747e80a3454a30e2e /merge-recursive.h | |
| parent | Merge branch 'js/git-gui-commit-gpgsign' into maint (diff) | |
| parent | patch-ids: refuse to compute patch-id for merge commit (diff) | |
| download | tgif-35ca3e538d2e36c528ff5382a0e3cca35b46c6ed.tar.xz | |
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
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions