projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 27d7c85 c9e3a4e)
Merge branch 'jk/log-cherry-pick-duplicate-patches'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Jan 2021 22:19:19 +0000 (14:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Jan 2021 22:19:19 +0000 (14:19 -0800)
commitb69bed22c59fa08848bd7ffa5fbfacc0b62fcd48
tree047ebb72feb3534f7929ae8a52cb9e43a0f23d81tree | snapshot
parent27d7c8599b159862762e2bd121c22d516fb04e90commit | diff
parentc9e3a4e76d57b03170118aa67054af0b81e7f507commit | 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
patch-ids.c diff1 | diff2 | blob | history
revision.c diff1 | diff2 | blob | history
t/t6007-rev-list-cherry-pick-file.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.