summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-05-04t6423: rename file within directory that other side renamedLibravatar Elijah Newren1-0/+58
2021-03-20Add testing with merge-ort merge strategyLibravatar Elijah Newren2-0/+3
2021-03-20t6423: mark remaining expected failure under merge-ort as suchLibravatar Elijah Newren1-1/+1
2021-03-20Revert "merge-ort: ignore the directory rename split conflict for now"Libravatar Elijah Newren1-12/+1
2021-03-20merge-recursive: add a bunch of FIXME comments documenting known bugsLibravatar Elijah Newren1-0/+37
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictLibravatar Elijah Newren6-0/+20
2021-03-20t: mark several submodule merging tests as fixed under merge-ortLibravatar Elijah Newren5-9/+22
2021-03-20merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesLibravatar Elijah Newren2-15/+32
2021-03-20t6428: new test for SKIP_WORKTREE handling and conflictsLibravatar Elijah Newren1-0/+158
2021-03-20merge-ort: support subtree shiftingLibravatar Elijah Newren1-0/+24
2021-03-20merge-ort: let renormalization change modify/delete into clean deleteLibravatar Elijah Newren1-2/+62
2021-03-20merge-ort: have ll_merge() use a special attr_index for renormalizationLibravatar Elijah Newren1-2/+62
2021-03-20merge-ort: add a special minimal index just for renormalizationLibravatar Elijah Newren1-0/+20
2021-03-20merge-ort: use STABLE_QSORT instead of QSORT where requiredLibravatar Elijah Newren1-1/+7
2021-03-18diffcore-rename: determine which relevant_sources are no longer relevantLibravatar Elijah Newren1-1/+50
2021-03-18merge-ort: record the reason that we want a rename for a fileLibravatar Elijah Newren2-5/+16
2021-03-18diffcore-rename: add computation of number of unknown renamesLibravatar Elijah Newren2-4/+40
2021-03-18diffcore-rename: check if we have enough renames for directories early onLibravatar Elijah Newren1-10/+63
2021-03-18diffcore-rename: only compute dir_rename_count for relevant directoriesLibravatar Elijah Newren1-5/+22
2021-03-18merge-ort: record the reason that we want a rename for a directoryLibravatar Elijah Newren3-4/+46
2021-03-18merge-ort, diffcore-rename: tweak dirs_removed and relevant_source typeLibravatar Elijah Newren3-40/+41
2021-03-18diffcore-rename: take advantage of "majority rules" to skip more renamesLibravatar Elijah Newren1-0/+25
2021-03-10diffcore-rename: avoid doing basename comparisons for irrelevant sourcesLibravatar Elijah Newren1-4/+33
2021-03-10merge-ort: skip rename detection entirely if possibleLibravatar Elijah Newren1-0/+44
2021-03-10merge-ort: use relevant_sources to filter possible rename sourcesLibravatar Elijah Newren1-1/+1
2021-03-10merge-ort: precompute whether directory rename detection is neededLibravatar Elijah Newren1-6/+61
2021-03-10merge-ort: introduce wrappers for alternate tree traversalLibravatar Elijah Newren1-0/+71
2021-03-10merge-ort: add data structures for an alternate tree traversalLibravatar Elijah Newren1-0/+26
2021-03-10merge-ort: precompute subset of sources for which we need rename detectionLibravatar Elijah Newren2-3/+103
2021-03-10diffcore-rename: enable filtering possible rename sourcesLibravatar Elijah Newren3-7/+21
2021-02-26diffcore-rename: compute dir_rename_guess from dir_rename_countsLibravatar Elijah Newren1-4/+41
2021-02-26diffcore-rename: limit dir_rename_counts computation to relevant dirsLibravatar Elijah Newren1-0/+10
2021-02-26diffcore-rename: compute dir_rename_counts in stagesLibravatar Elijah Newren1-40/+70
2021-02-26diffcore-rename: extend cleanup_dir_rename_info()Libravatar Elijah Newren1-4/+36
2021-02-26diffcore-rename: move dir_rename_counts into dir_rename_info structLibravatar Elijah Newren1-11/+16
2021-02-26diffcore-rename: add function for clearing dir_rename_countLibravatar Elijah Newren3-9/+17
2021-02-26Move computation of dir_rename_count from merge-ort to diffcore-renameLibravatar Elijah Newren3-130/+145
2021-02-26diffcore-rename: add a mapping of destination names to their indicesLibravatar Elijah Newren1-0/+45
2021-02-26diffcore-rename: provide basic implementation of idx_possible_rename()Libravatar Elijah Newren1-6/+94
2021-02-26diffcore-rename: use directory rename guided basename comparisonsLibravatar Elijah Newren2-9/+35
2021-02-15merge-ort: call diffcore_rename() directlyLibravatar Elijah Newren1-7/+59
2021-02-15gitdiffcore doc: mention new preliminary step for rename detectionLibravatar Elijah Newren1-0/+20
2021-02-15diffcore-rename: guide inexact rename detection based on basenamesLibravatar Elijah Newren2-8/+52
2021-02-15diffcore-rename: complete find_basename_matches()Libravatar Elijah Newren1-3/+79
2021-02-15diffcore-rename: compute basenames of source and dest candidatesLibravatar Elijah Newren1-0/+63
2021-02-15t4001: add a test comparing basename similarity and content similarityLibravatar Elijah Newren1-0/+23
2021-02-15diffcore-rename: filter rename_src list when possibleLibravatar Elijah Newren1-8/+51
2021-02-12diffcore-rename: no point trying to find a match better than exactLibravatar Elijah Newren1-6/+14
2021-02-11Sync with maintLibravatar Junio C Hamano0-0/+0
2021-02-11Merge branch 'en/merge-ort-perf'Libravatar Junio C Hamano2-1/+94
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 00:36:09 +0000