git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'en/remerge-diff'	Junio C Hamano	2022-02-17	1	-5/+50
\|\
\| *	merge-ort: mark conflict/warning messages from inner merges as omittable	Elijah Newren	2022-02-02	1	-1/+3
\| *	show, log: include conflict/warning messages in --remerge-diff headers	Elijah Newren	2022-02-02	1	-0/+1
\| *	merge-ort: format messages slightly different for use in headers	Elijah Newren	2022-02-02	1	-2/+40
\| *	merge-ort: mark a few more conflict messages as omittable	Elijah Newren	2022-02-02	1	-2/+2
\| *	merge-ort: capture and print ll-merge warnings in our preferred fashion	Elijah Newren	2022-02-02	1	-2/+3
\| *	ll-merge: make callers responsible for showing warnings	Elijah Newren	2022-02-02	1	-1/+4
* \|	Merge branch 'en/plug-leaks-in-merge'	Junio C Hamano	2022-02-09	1	-5/+5
\|\ \
\| * \|	merge-ort: fix memory leak in merge_ort_internal()	Elijah Newren	2022-01-22	1	-5/+5
* \| \|	Merge branch 'en/merge-ort-restart-optim-fix'	Junio C Hamano	2022-02-09	1	-0/+4
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	merge-ort: avoid assuming all renames detected	Elijah Newren	2022-01-17	1	-0/+4
* \| \|	merge-ort: fix bug with renormalization and rename/delete conflicts	Elijah Newren	2021-12-30	1	-3/+16
\| \|/ \|/\|
* \|	Merge branch 'jt/no-abuse-alternate-odb-for-submodules'	Junio C Hamano	2021-10-26	1	-14/+4
\|\ \
\| * \|	merge-{ort,recursive}: remove add_submodule_odb()	Jonathan Tan	2021-10-09	1	-14/+4
\| * \|	Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-f...	Junio C Hamano	2021-09-23	1	-18/+35
\| \|\ \
* \| \ \	Merge branch 'en/removing-untracked-fixes'	Junio C Hamano	2021-10-14	1	-7/+1
\|\ \ \ \
\| * \| \| \|	Remove ignored files by default when they are in the way	Elijah Newren	2021-09-27	1	-1/+1
\| * \| \| \|	unpack-trees: introduce preserve_ignored to unpack_trees_options	Elijah Newren	2021-09-27	1	-7/+1
* \| \| \| \|	Merge branch 'jt/add-submodule-odb-clean-up'	Junio C Hamano	2021-10-06	1	-18/+35
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	revision: remove "submodule" from opt struct	Jonathan Tan	2021-09-09	1	-18/+35
* \| \| \| \|	Merge branch 'en/typofixes'	Junio C Hamano	2021-09-28	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| / \| \| \|_\|/ \| \|/\| \|
\| * \| \|	merge-ort: fix completely wrong comment	Elijah Newren	2021-09-20	1	-1/+1
\| \|/ /
* \| \|	Merge branch 'ds/mergies-with-sparse-index'	Junio C Hamano	2021-09-21	1	-0/+15
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	merge-ort: expand only for out-of-cone conflicts	Derrick Stolee	2021-09-10	1	-3/+10
\| * \|	merge: make sparse-aware with ORT	Derrick Stolee	2021-09-10	1	-0/+8
\| \|/
* \|	Merge branch 'en/ort-perf-batch-15'	Junio C Hamano	2021-08-25	1	-85/+103
\|\ \ \| \|/ \|/\|
\| *	merge-ort: remove compile-time ability to turn off usage of memory pools	Elijah Newren	2021-08-04	1	-162/+47
\| *	merge-ort: reuse path strings in pool_alloc_filespec	Elijah Newren	2021-07-30	1	-7/+22
\| *	merge-ort: store filepairs and filespecs in our mem_pool	Elijah Newren	2021-07-30	1	-12/+14
\| *	diffcore-rename, merge-ort: add wrapper functions for filepair alloc/dealloc	Elijah Newren	2021-07-30	1	-0/+42
\| *	merge-ort: switch our strmaps over to using memory pools	Elijah Newren	2021-07-30	1	-50/+75
\| *	merge-ort: set up a memory pool	Elijah Newren	2021-07-30	1	-0/+25
\| *	merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappers	Elijah Newren	2021-07-30	1	-0/+24
\| *	merge-ort: rename str{map,intmap,set}_func()	Elijah Newren	2021-07-30	1	-13/+13
* \|	Merge branch 'en/ort-perf-batch-14'	Junio C Hamano	2021-08-04	1	-11/+388
\|\\|
\| *	merge-ort: restart merge with cached renames to reduce process entry cost	Elijah Newren	2021-07-20	1	-6/+86
\| *	merge-ort: avoid recursing into directories when we don't need to	Elijah Newren	2021-07-20	1	-3/+99
\| *	merge-ort: defer recursing into directories when merge base is matched	Elijah Newren	2021-07-20	1	-2/+31
\| *	merge-ort: add a handle_deferred_entries() helper function	Elijah Newren	2021-07-20	1	-0/+64
\| *	merge-ort: add data structures for allowable trivial directory resolves	Elijah Newren	2021-07-20	1	-0/+61
\| *	merge-ort: add some more explanations in collect_merge_info_callback()	Elijah Newren	2021-07-20	1	-5/+15
\| *	merge-ort: resolve paths early when we have sufficient information	Elijah Newren	2021-07-20	1	-0/+37
* \|	Merge branch 'en/rename-limits-doc'	Junio C Hamano	2021-07-28	1	-1/+1
\|\ \
\| * \|	rename: bump limit defaults yet again	Elijah Newren	2021-07-16	1	-1/+1
* \| \|	Merge branch 'ab/attribute-format'	Junio C Hamano	2021-07-28	1	-0/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	*.c static functions: add missing __attribute__((format))	Ævar Arnfjörð Bjarmason	2021-07-14	1	-0/+1
\| \|/
* \|	Merge branch 'ab/struct-init'	Junio C Hamano	2021-07-17	1	-2/+2
\|\ \
\| * \|	string-list.h users: change to use *_{nodup,dup}()	Ævar Arnfjörð Bjarmason	2021-07-01	1	-2/+2
* \| \|	Merge branch 'en/merge-dir-rename-corner-case-fix'	Junio C Hamano	2021-07-17	1	-1/+5
\|\ \ \
\| * \| \|	merge-ort: ensure we consult df_conflict and path_conflicts	Elijah Newren	2021-06-30	1	-1/+5
\| \|/ /