Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
merge-ort.c
Age
Commit message (
Expand
)
Author
2021-05-16
Merge branch 'ah/merge-ort-i18n'
Junio C Hamano
2021-05-11
merge-ort: split "distinct types" message into two translatable messages
Alex Henrie
2021-05-10
Merge branch 'bc/hash-transition-interop-part-1'
Junio C Hamano
2021-04-30
Merge branch 'ds/sparse-index-protections'
Junio C Hamano
2021-04-27
hash: provide per-algorithm null OIDs
brian m. carlson
2021-04-16
Merge branch 'ah/merge-ort-ubsan-fix'
Junio C Hamano
2021-04-16
Merge branch 'en/ort-readiness'
Junio C Hamano
2021-04-16
Merge branch 'en/ort-perf-batch-10'
Junio C Hamano
2021-04-12
merge-ort: only do pointer arithmetic for non-empty lists
Andrzej Hunt
2021-04-08
Merge branch 'en/ort-perf-batch-9'
Junio C Hamano
2021-03-23
Merge branch 'en/ort-perf-batch-8'
Junio C Hamano
2021-03-20
Revert "merge-ort: ignore the directory rename split conflict for now"
Elijah Newren
2021-03-20
merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict
Elijah Newren
2021-03-20
merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries
Elijah Newren
2021-03-20
merge-ort: support subtree shifting
Elijah Newren
2021-03-20
merge-ort: let renormalization change modify/delete into clean delete
Elijah Newren
2021-03-20
merge-ort: have ll_merge() use a special attr_index for renormalization
Elijah Newren
2021-03-20
merge-ort: add a special minimal index just for renormalization
Elijah Newren
2021-03-20
merge-ort: use STABLE_QSORT instead of QSORT where required
Elijah Newren
2021-03-19
merge-ort: record the reason that we want a rename for a file
Elijah Newren
2021-03-19
diffcore-rename: add computation of number of unknown renames
Elijah Newren
2021-03-19
merge-ort: record the reason that we want a rename for a directory
Elijah Newren
2021-03-19
merge-ort, diffcore-rename: tweak dirs_removed and relevant_source type
Elijah Newren
2021-03-14
use CALLOC_ARRAY
René Scharfe
2021-03-11
merge-ort: skip rename detection entirely if possible
Elijah Newren
2021-03-11
merge-ort: use relevant_sources to filter possible rename sources
Elijah Newren
2021-03-11
merge-ort: precompute whether directory rename detection is needed
Elijah Newren
2021-03-11
merge-ort: introduce wrappers for alternate tree traversal
Elijah Newren
2021-03-11
merge-ort: add data structures for an alternate tree traversal
Elijah Newren
2021-03-11
merge-ort: precompute subset of sources for which we need rename detection
Elijah Newren
2021-03-11
diffcore-rename: enable filtering possible rename sources
Elijah Newren
2021-02-27
diffcore-rename: add function for clearing dir_rename_count
Elijah Newren
2021-02-27
Move computation of dir_rename_count from merge-ort to diffcore-rename
Elijah Newren
2021-02-16
merge-ort: call diffcore_rename() directly
Elijah Newren
2021-01-24
merge-ort: begin performance work; instrument with trace2_region_* calls
Elijah Newren
2021-01-24
merge-ort: ignore the directory rename split conflict for now
Elijah Newren
2021-01-24
merge-ort: fix massive leak
Elijah Newren
2021-01-21
Merge branch 'en/ort-directory-rename' into en/merge-ort-perf
Junio C Hamano
2021-01-21
merge-ort: fix a directory rename detection bug
Elijah Newren
2021-01-21
merge-ort: process_renames() now needs more defensiveness
Elijah Newren
2021-01-21
merge-ort: implement apply_directory_rename_modifications()
Elijah Newren
2021-01-21
merge-ort: add a new toplevel_dir field
Elijah Newren
2021-01-21
merge-ort: implement handle_path_level_conflicts()
Elijah Newren
2021-01-21
merge-ort: implement check_for_directory_rename()
Elijah Newren
2021-01-21
merge-ort: implement apply_dir_rename() and check_dir_renamed()
Elijah Newren
2021-01-21
merge-ort: implement compute_collisions()
Elijah Newren
2021-01-21
merge-ort: modify collect_renames() for directory rename handling
Elijah Newren
2021-01-21
merge-ort: implement handle_directory_level_conflicts()
Elijah Newren
2021-01-21
merge-ort: implement compute_rename_counts()
Elijah Newren
2021-01-21
merge-ort: copy get_renamed_dir_portion() from merge-recursive.c
Elijah Newren
[next]