]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5b047ac) | patch
merge-recursive: apply necessary modifications for directory renames
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:10 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commit9c0743fe1e45b3a0ffe166ac949a27f95a3e5c34
treed88c56b3315d682a1dd3cca1badb221de5b04354tree | snapshot
parent5b047ac07084b7b8508ea706a9950fc19709358ccommit | diff
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>
merge-recursive.c diff | blob | history
t/t6043-merge-rename-directories.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.