index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
merge-ort.c
Age
Commit message (
Expand
)
Author
Files
Lines
2021-02-15
merge-ort: call diffcore_rename() directly
Elijah Newren
1
-7
/
+59
2021-01-23
merge-ort: begin performance work; instrument with trace2_region_* calls
Elijah Newren
1
-0
/
+57
2021-01-23
merge-ort: ignore the directory rename split conflict for now
Elijah Newren
1
-1
/
+12
2021-01-23
merge-ort: fix massive leak
Elijah Newren
1
-0
/
+17
2021-01-20
Merge branch 'en/ort-directory-rename' into en/merge-ort-perf
Junio C Hamano
1
-22
/
+1228
2021-01-20
merge-ort: fix a directory rename detection bug
Elijah Newren
1
-117
/
+81
2021-01-20
merge-ort: process_renames() now needs more defensiveness
Elijah Newren
1
-5
/
+21
2021-01-20
merge-ort: implement apply_directory_rename_modifications()
Elijah Newren
1
-1
/
+167
2021-01-20
merge-ort: add a new toplevel_dir field
Elijah Newren
1
-6
/
+9
2021-01-20
merge-ort: implement handle_path_level_conflicts()
Elijah Newren
1
-1
/
+71
2021-01-20
merge-ort: implement check_for_directory_rename()
Elijah Newren
1
-1
/
+66
2021-01-20
merge-ort: implement apply_dir_rename() and check_dir_renamed()
Elijah Newren
1
-2
/
+35
2021-01-20
merge-ort: implement compute_collisions()
Elijah Newren
1
-1
/
+67
2021-01-20
merge-ort: modify collect_renames() for directory rename handling
Elijah Newren
1
-4
/
+74
2021-01-20
merge-ort: implement handle_directory_level_conflicts()
Elijah Newren
1
-1
/
+18
2021-01-20
merge-ort: implement compute_rename_counts()
Elijah Newren
1
-2
/
+52
2021-01-20
merge-ort: copy get_renamed_dir_portion() from merge-recursive.c
Elijah Newren
1
-0
/
+104
2021-01-20
merge-ort: add outline of get_provisional_directory_renames()
Elijah Newren
1
-1
/
+56
2021-01-20
merge-ort: add outline for computing directory renames
Elijah Newren
1
-1
/
+24
2021-01-14
Merge branch 'en/ort-conflict-handling' into en/merge-ort-perf
Junio C Hamano
1
-18
/
+653
2021-01-07
merge-ort: collect which directories are removed in dirs_removed
Elijah Newren
1
-0
/
+27
2021-01-07
merge-ort: initialize and free new directory rename data structures
Elijah Newren
1
-0
/
+35
2021-01-07
merge-ort: add new data structures for directory rename detection
Elijah Newren
1
-3
/
+31
2021-01-07
Merge branch 'en/merge-ort-3' into en/ort-directory-rename
Junio C Hamano
1
-16
/
+430
2021-01-04
merge-ort: add handling for different types of files at same path
Elijah Newren
1
-4
/
+103
2021-01-04
merge-ort: copy find_first_merges() implementation from merge-recursive.c
Elijah Newren
1
-1
/
+56
2021-01-04
merge-ort: implement format_commit()
Elijah Newren
1
-1
/
+13
2021-01-04
merge-ort: copy and adapt merge_submodule() from merge-recursive.c
Elijah Newren
1
-1
/
+125
2021-01-04
merge-ort: copy and adapt merge_3way() from merge-recursive.c
Elijah Newren
1
-1
/
+53
2021-01-04
merge-ort: flesh out implementation of handle_content_merge()
Elijah Newren
1
-6
/
+143
2021-01-04
merge-ort: handle book-keeping around two- and three-way content merge
Elijah Newren
1
-11
/
+41
2021-01-04
merge-ort: implement unique_path() helper
Elijah Newren
1
-1
/
+24
2021-01-04
merge-ort: handle directory/file conflicts that remain
Elijah Newren
1
-2
/
+84
2021-01-04
merge-ort: handle D/F conflict where directory disappears due to merge
Elijah Newren
1
-1
/
+22
2020-12-16
merge-ort: implement merge_incore_recursive()
Elijah Newren
1
-2
/
+88
2020-12-16
merge-ort: make clear_internal_opts() aware of partial clearing
Elijah Newren
1
-6
/
+7
2020-12-16
merge-ort: copy a few small helper functions from merge-recursive.c
Elijah Newren
1
-0
/
+20
2020-12-15
merge-ort: add implementation of type-changed rename handling
Elijah Newren
1
-3
/
+32
2020-12-15
merge-ort: add implementation of normal rename handling
Elijah Newren
1
-1
/
+5
2020-12-15
merge-ort: add implementation of rename collisions
Elijah Newren
1
-3
/
+51
2020-12-15
merge-ort: add implementation of rename/delete conflicts
Elijah Newren
1
-8
/
+40
2020-12-15
merge-ort: add implementation of both sides renaming differently
Elijah Newren
1
-3
/
+55
2020-12-15
merge-ort: add implementation of both sides renaming identically
Elijah Newren
1
-2
/
+18
2020-12-14
merge-ort: add basic outline for process_renames()
Elijah Newren
1
-1
/
+97
2020-12-14
merge-ort: implement compare_pairs() and collect_renames()
Elijah Newren
1
-2
/
+33
2020-12-14
merge-ort: implement detect_regular_renames()
Elijah Newren
1
-1
/
+31
2020-12-14
merge-ort: add initial outline for basic rename detection
Elijah Newren
1
-8
/
+60
2020-12-14
merge-ort: add basic data structures for handling renames
Elijah Newren
1
-0
/
+24
2020-12-13
merge-ort: add modify/delete handling and delayed output processing
Elijah Newren
1
-2
/
+98
2020-12-13
merge-ort: add die-not-implemented stub handle_content_merge() function
Elijah Newren
1
-0
/
+14
[next]