diff options
| author | Elijah Newren <newren@gmail.com> | 2018-02-14 10:52:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 14:11:58 -0800 |
| commit | 3b9616f149e46e1a97bf6dd5bc727a663d92dded (patch) | |
| tree | 495c6ceec94bbc70002bc6a357d81091ad0185ae /builtin/commit.c | |
| parent | merge-recursive: when comparing files, don't include trees (diff) | |
| download | git-3b9616f149e46e1a97bf6dd5bc727a663d92dded.tar.gz git-3b9616f149e46e1a97bf6dd5bc727a663d92dded.zip | |
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 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions