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
2022-02-18
merge-ort: make informational messages from recursive merges clearer
Elijah Newren
2022-02-17
Merge branch 'en/remerge-diff'
Junio C Hamano
2022-02-10
Merge branch 'en/plug-leaks-in-merge'
Junio C Hamano
2022-02-10
Merge branch 'en/merge-ort-restart-optim-fix'
Junio C Hamano
2022-02-02
merge-ort: mark conflict/warning messages from inner merges as omittable
Elijah Newren
2022-02-02
show, log: include conflict/warning messages in --remerge-diff headers
Elijah Newren
2022-02-02
merge-ort: format messages slightly different for use in headers
Elijah Newren
2022-02-02
merge-ort: mark a few more conflict messages as omittable
Elijah Newren
2022-02-02
merge-ort: capture and print ll-merge warnings in our preferred fashion
Elijah Newren
2022-02-02
ll-merge: make callers responsible for showing warnings
Elijah Newren
2022-01-22
merge-ort: fix memory leak in merge_ort_internal()
Elijah Newren
2022-01-18
merge-ort: avoid assuming all renames detected
Elijah Newren
2021-12-30
merge-ort: fix bug with renormalization and rename/delete conflicts
Elijah Newren
2021-10-26
Merge branch 'jt/no-abuse-alternate-odb-for-submodules'
Junio C Hamano
2021-10-14
Merge branch 'en/removing-untracked-fixes'
Junio C Hamano
2021-10-09
merge-{ort,recursive}: remove add_submodule_odb()
Jonathan Tan
2021-10-06
Merge branch 'jt/add-submodule-odb-clean-up'
Junio C Hamano
2021-09-28
Merge branch 'en/typofixes'
Junio C Hamano
2021-09-27
Remove ignored files by default when they are in the way
Elijah Newren
2021-09-27
unpack-trees: introduce preserve_ignored to unpack_trees_options
Elijah Newren
2021-09-23
Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-f...
Junio C Hamano
2021-09-21
Merge branch 'ds/mergies-with-sparse-index'
Junio C Hamano
2021-09-20
merge-ort: fix completely wrong comment
Elijah Newren
2021-09-10
merge-ort: expand only for out-of-cone conflicts
Derrick Stolee
2021-09-10
merge: make sparse-aware with ORT
Derrick Stolee
2021-09-10
revision: remove "submodule" from opt struct
Jonathan Tan
2021-08-25
Merge branch 'en/ort-perf-batch-15'
Junio C Hamano
2021-08-04
Merge branch 'en/ort-perf-batch-14'
Junio C Hamano
2021-08-04
merge-ort: remove compile-time ability to turn off usage of memory pools
Elijah Newren
2021-07-30
merge-ort: reuse path strings in pool_alloc_filespec
Elijah Newren
2021-07-30
merge-ort: store filepairs and filespecs in our mem_pool
Elijah Newren
2021-07-30
diffcore-rename, merge-ort: add wrapper functions for filepair alloc/dealloc
Elijah Newren
2021-07-30
merge-ort: switch our strmaps over to using memory pools
Elijah Newren
2021-07-30
merge-ort: set up a memory pool
Elijah Newren
2021-07-30
merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappers
Elijah Newren
2021-07-30
merge-ort: rename str{map,intmap,set}_func()
Elijah Newren
2021-07-28
Merge branch 'en/rename-limits-doc'
Junio C Hamano
2021-07-28
Merge branch 'ab/attribute-format'
Junio C Hamano
2021-07-21
merge-ort: restart merge with cached renames to reduce process entry cost
Elijah Newren
2021-07-21
merge-ort: avoid recursing into directories when we don't need to
Elijah Newren
2021-07-21
merge-ort: defer recursing into directories when merge base is matched
Elijah Newren
2021-07-21
merge-ort: add a handle_deferred_entries() helper function
Elijah Newren
2021-07-21
merge-ort: add data structures for allowable trivial directory resolves
Elijah Newren
2021-07-21
merge-ort: add some more explanations in collect_merge_info_callback()
Elijah Newren
2021-07-21
merge-ort: resolve paths early when we have sufficient information
Elijah Newren
2021-07-17
Merge branch 'ab/struct-init'
Junio C Hamano
2021-07-17
Merge branch 'en/merge-dir-rename-corner-case-fix'
Junio C Hamano
2021-07-17
Merge branch 'en/ort-perf-batch-13'
Junio C Hamano
2021-07-17
Merge branch 'en/ort-perf-batch-12'
Junio C Hamano
2021-07-16
rename: bump limit defaults yet again
Elijah Newren
[next]