diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-25 14:19:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-25 14:19:19 -0800 |
| commit | b69bed22c59fa08848bd7ffa5fbfacc0b62fcd48 (patch) | |
| tree | 047ebb72feb3534f7929ae8a52cb9e43a0f23d81 /builtin/diff.c | |
| parent | 27d7c8599b159862762e2bd121c22d516fb04e90 (diff) | |
| parent | c9e3a4e76d57b03170118aa67054af0b81e7f507 (diff) | |
Merge branch 'jk/log-cherry-pick-duplicate-patches'
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/diff.c')
0 files changed, 0 insertions, 0 deletions