]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8e3ec76 957876f)
Merge branch 'jk/diff-cc-oidfind-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Oct 2020 21:01:54 +0000 (14:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Oct 2020 21:01:55 +0000 (14:01 -0700)
commit7da656f1e083b065400c4ab92405c6332481eb7a
tree45b808e3d89448356fc4a591b9b3358034d113b1tree | snapshot
parent8e3ec76a20d6abf5dd8ceb3f5f2c157000e4c13ecommit | diff
parent957876f17d75b5cd0e94b85d3df843bb1e9ae110commit | diff
Merge branch 'jk/diff-cc-oidfind-fix'

"log -c --find-object=X" did not work well to find a merge that
involves a change to an object X from only one parent.

* jk/diff-cc-oidfind-fix:
  combine-diff: handle --find-object in multitree code path
combine-diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.