diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:28 -0800 |
| commit | 2d436678a70c118bc2683b8d81131459e602a1d7 (patch) | |
| tree | 552fe457ec2d800874d4a1a09d50f2f53be492db /builtin/fmt-merge-msg.c | |
| parent | Merge branch 'jk/forbid-lf-in-git-url' into maint (diff) | |
| parent | patch-ids: handle duplicate hashmap entries (diff) | |
| download | tgif-2d436678a70c118bc2683b8d81131459e602a1d7.tar.xz | |
Merge branch 'jk/log-cherry-pick-duplicate-patches' into maint
When more than one commit with the same patch ID appears on one
side, "git log --cherry-pick A...B" did not exclude them all when a
commit with the same patch ID appears on the other side. Now it
does.
* jk/log-cherry-pick-duplicate-patches:
patch-ids: handle duplicate hashmap entries
Diffstat (limited to 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions