git - Distributed version control system

	Commit message (Expand)	Author	Age	Files	Lines
*	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-15	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-13	1	-0/+1
\| \|/
* \|	Merge branch 'ab/struct-init'	Junio C Hamano	2021-07-16	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-16	1	-1/+5
\|\ \ \
\| * \| \|	merge-ort: ensure we consult df_conflict and path_conflicts	Elijah Newren	2021-06-30	1	-1/+5
\| \|/ /
* \| \|	Merge branch 'en/ort-perf-batch-13'	Junio C Hamano	2021-07-16	1	-0/+50
\|\ \ \
\| * \| \|	merge-ort: add prefetching for content merges	Elijah Newren	2021-06-28	1	-0/+50
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'en/ort-perf-batch-12'	Junio C Hamano	2021-07-16	1	-23/+57
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	merge-ort: miscellaneous touch-ups	Elijah Newren	2021-06-09	1	-0/+5
\| * \|	Fix various issues found in comments	Elijah Newren	2021-06-09	1	-3/+5
\| * \|	merge-ort: replace string_list_df_name_compare with faster alternative	Elijah Newren	2021-06-09	1	-20/+47
* \| \|	Merge branch 'en/ort-perf-batch-11'	Junio C Hamano	2021-06-14	1	-12/+319
\|\\| \| \| \|/ \|/\|
\| *	merge-ort, diffcore-rename: employ cached renames when possible	Elijah Newren	2021-05-20	1	-5/+42
\| *	merge-ort: handle interactions of caching and rename/rename(1to1) cases	Elijah Newren	2021-05-20	1	-1/+29
\| *	merge-ort: add helper functions for using cached renames	Elijah Newren	2021-05-20	1	-0/+47
\| *	merge-ort: preserve cached renames for the appropriate side	Elijah Newren	2021-05-20	1	-9/+11
\| *	merge-ort: avoid accidental API mis-use	Elijah Newren	2021-05-20	1	-0/+7
\| *	merge-ort: add code to check for whether cached renames can be reused	Elijah Newren	2021-05-20	1	-2/+64
\| *	merge-ort: populate caches of rename detection results	Elijah Newren	2021-05-20	1	-1/+72
\| *	merge-ort: add data structures for in-memory caching of rename detection	Elijah Newren	2021-05-20	1	-0/+53
* \|	Merge branch 'ah/merge-ort-i18n'	Junio C Hamano	2021-05-16	1	-6/+15
\|\ \
\| * \|	merge-ort: split "distinct types" message into two translatable messages	Alex Henrie	2021-05-11	1	-6/+15
* \| \|	Merge branch 'bc/hash-transition-interop-part-1'	Junio C Hamano	2021-05-10	1	-10/+10
\|\ \ \
\| * \| \|	hash: provide per-algorithm null OIDs	brian m. carlson	2021-04-27	1	-10/+10
* \| \| \|	Merge branch 'ds/sparse-index-protections'	Junio C Hamano	2021-04-30	1	-1/+1
\|\ \ \ \
* \ \ \ \	Merge branch 'ah/merge-ort-ubsan-fix'	Junio C Hamano	2021-04-16	1	-14/+6
\|\ \ \ \ \
\| * \| \| \| \|	merge-ort: only do pointer arithmetic for non-empty lists	Andrzej Hunt	2021-04-12	1	-13/+5
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'en/ort-readiness'	Junio C Hamano	2021-04-16	1	-28/+215
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Revert "merge-ort: ignore the directory rename split conflict for now"	Elijah Newren	2021-03-20	1	-12/+1
\| * \| \| \|	merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict	Elijah Newren	2021-03-20	1	-0/+10
\| * \| \| \|	merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries	Elijah Newren	2021-03-20	1	-13/+30
\| * \| \| \|	merge-ort: support subtree shifting	Elijah Newren	2021-03-20	1	-0/+24
\| * \| \| \|	merge-ort: let renormalization change modify/delete into clean delete	Elijah Newren	2021-03-20	1	-2/+62
\| * \| \| \|	merge-ort: have ll_merge() use a special attr_index for renormalization	Elijah Newren	2021-03-20	1	-2/+62
\| * \| \| \|	merge-ort: add a special minimal index just for renormalization	Elijah Newren	2021-03-20	1	-0/+20
\| * \| \| \|	merge-ort: use STABLE_QSORT instead of QSORT where required	Elijah Newren	2021-03-20	1	-1/+7
* \| \| \| \|	Merge branch 'en/ort-perf-batch-10'	Junio C Hamano	2021-04-16	1	-18/+61
\|\\| \| \| \| \| \|/ / / \|/\| \| \|
\| * \| \|	merge-ort: record the reason that we want a rename for a file	Elijah Newren	2021-03-18	1	-5/+10
\| * \| \|	diffcore-rename: add computation of number of unknown renames	Elijah Newren	2021-03-18	1	-0/+3
\| * \| \|	merge-ort: record the reason that we want a rename for a directory	Elijah Newren	2021-03-18	1	-3/+38
\| * \| \|	merge-ort, diffcore-rename: tweak dirs_removed and relevant_source type	Elijah Newren	2021-03-18	1	-14/+14
* \| \| \|	Merge branch 'en/ort-perf-batch-9'	Junio C Hamano	2021-04-08	1	-4/+230
\|\\| \| \|
\| * \| \|	merge-ort: skip rename detection entirely if possible	Elijah Newren	2021-03-10	1	-0/+44
\| * \| \|	merge-ort: use relevant_sources to filter possible rename sources	Elijah Newren	2021-03-10	1	-1/+1
\| * \| \|	merge-ort: precompute whether directory rename detection is needed	Elijah Newren	2021-03-10	1	-6/+61
\| * \| \|	merge-ort: introduce wrappers for alternate tree traversal	Elijah Newren	2021-03-10	1	-0/+71
\| * \| \|	merge-ort: add data structures for an alternate tree traversal	Elijah Newren	2021-03-10	1	-0/+26