]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 635ff67 c9e3a4e)
Merge branch 'jk/log-cherry-pick-duplicate-patches' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 6 Feb 2021 00:31:27 +0000 (16:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 6 Feb 2021 00:31:28 +0000 (16:31 -0800)
commit2d436678a70c118bc2683b8d81131459e602a1d7
tree552fe457ec2d800874d4a1a09d50f2f53be492dbtree | snapshot
parent635ff6759069dfea7c6e448afa8c245405f53a18commit | diff
parentc9e3a4e76d57b03170118aa67054af0b81e7f507commit | diff
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
patch-ids.c diff1 | diff2 | blob | history
revision.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.