diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:29:01 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:04 -0700 |
| commit | 161cf7f9490285700432f23a953f8e238f3469f5 (patch) | |
| tree | ea5a89c09bc2e0e04064ea909bdc74c083b52d4f /Documentation/git-diff-index.txt | |
| parent | merge-recursive: Move handling of double rename of one file to two (diff) | |
| download | tgif-161cf7f9490285700432f23a953f8e238f3469f5.tar.xz | |
merge-recursive: Move handling of double rename of one file to other file
Move the handling of rename/rename conflicts where one file is renamed on
both sides to the same file, from process_renames() to process_entry().
Here we avoid the three way merge logic by just using
update_stages_and_entry() to move the higher stage entries in the index
from the rename source to the rename destination, and then allow
process_entry() to do its magic.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-diff-index.txt')
0 files changed, 0 insertions, 0 deletions