| commit | 3b9616f149e46e1a97bf6dd5bc727a663d92dded | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 14 Feb 2018 18:52:00 +0000 (14 10:52 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Feb 2018 22:11:58 +0000 (27 14:11 -0800) | ||
| tree | 495c6ceec94bbc70002bc6a357d81091ad0185ae | treesnapshot (tar.gz zip) |
| parent | 7d38849eb77b0d62a283eb2903ababf6c33673dd | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory | |
| t/t6043-merge-rename-directories.sh | diffblobblamehistory |