summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/2.15.0.txt
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-02-14 10:52:00 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-02-27 14:11:58 -0800
commit3b9616f149e46e1a97bf6dd5bc727a663d92dded (patch)
tree495c6ceec94bbc70002bc6a357d81091ad0185ae /Documentation/RelNotes/2.15.0.txt
parentmerge-recursive: when comparing files, don't include trees (diff)
downloadtgif-3b9616f149e46e1a97bf6dd5bc727a663d92dded.tar.xz
merge-recursive: apply necessary modifications for directory renames
This commit hooks together all the directory rename logic by making the necessary changes to the rename struct, it's dst_entry, and the diff_filepair under consideration. Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/2.15.0.txt')
0 files changed, 0 insertions, 0 deletions