diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-10-05 14:01:54 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-10-05 14:01:55 -0700 |
commit | 7da656f1e083b065400c4ab92405c6332481eb7a (patch) | |
tree | 45b808e3d89448356fc4a591b9b3358034d113b1 /Documentation/git-commit-tree.txt | |
parent | Merge branch 'jk/refspecs-negative' (diff) | |
parent | combine-diff: handle --find-object in multitree code path (diff) | |
download | tgif-7da656f1e083b065400c4ab92405c6332481eb7a.tar.xz |
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
Diffstat (limited to 'Documentation/git-commit-tree.txt')
0 files changed, 0 insertions, 0 deletions