git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	merge-ort: restart merge with cached renames to reduce process entry cost	Elijah Newren	2021-07-20	1	-1/+1
*	Merge branch 'en/merge-dir-rename-corner-case-fix'	Junio C Hamano	2021-07-17	1	-0/+175
\|\
\| *	merge-recursive: handle rename-to-self case	Elijah Newren	2021-06-30	1	-3/+3
\| *	merge-ort: ensure we consult df_conflict and path_conflicts	Elijah Newren	2021-06-30	1	-3/+3
\| *	t6423: test directory renames causing rename-to-self	Elijah Newren	2021-06-30	1	-0/+175
* \|	Merge branch 'en/ort-perf-batch-12'	Junio C Hamano	2021-07-17	1	-1/+1
\|\ \
\| * \|	Fix various issues found in comments	Elijah Newren	2021-06-09	1	-1/+1
* \| \|	Merge branch 'en/ort-perf-batch-11'	Junio C Hamano	2021-06-14	1	-0/+58
\|\\| \| \| \|/ \|/\|
\| *	t6423: rename file within directory that other side renamed	Elijah Newren	2021-05-04	1	-0/+58
* \|	Merge branch 'en/ort-readiness'	Junio C Hamano	2021-04-16	1	-1/+1
\|\\|
\| *	t6423: mark remaining expected failure under merge-ort as such	Elijah Newren	2021-03-20	1	-1/+1
* \|	Merge branch 'en/ort-perf-batch-9'	Junio C Hamano	2021-04-08	1	-0/+71
\|\\|
\| *	merge-ort: precompute subset of sources for which we need rename detection	Elijah Newren	2021-03-11	1	-0/+71
* \|	tests: remove most uses of C_LOCALE_OUTPUT	Ævar Arnfjörð Bjarmason	2021-02-11	1	-1/+1
\|/
*	t6423: add more details about direct resolution of directories	Elijah Newren	2020-10-26	1	-16/+23
*	t6423: note improved ort handling with untracked files	Elijah Newren	2020-10-26	1	-71/+124
*	t6423, t6436: note improved ort handling with dirty files	Elijah Newren	2020-10-26	1	-114/+152
*	t6423: expect improved conflict markers labels in the ort backend	Elijah Newren	2020-10-26	1	-10/+28
*	t6404, t6423: expect improved rename/delete handling in ort backend	Elijah Newren	2020-10-26	1	-20/+50
*	merge tests: expect improved directory/file conflict handling in ort	Elijah Newren	2020-10-26	1	-15/+38
*	t/: new helper for tests that pass with ort but fail with recursive	Elijah Newren	2020-10-26	1	-6/+7
*	t6423: more involved rules for renaming directories into each other	Elijah Newren	2020-10-16	1	-26/+227
*	t6423: update directory rename detection tests with new rule	Elijah Newren	2020-10-16	1	-21/+123
*	t6423: more involved directory rename test	Elijah Newren	2020-10-16	1	-0/+195
*	t642[23]: be more flexible for add/add conflicts involving pair renames	Elijah Newren	2020-08-11	1	-2/+2
*	t6423: add an explanation about why one of the tests does not pass	Elijah Newren	2020-08-11	1	-0/+8
*	t6416, t6423: clarify some comments and fix some typos	Elijah Newren	2020-08-11	1	-13/+12
*	t6423: fix test setup for a couple tests	Elijah Newren	2020-08-11	1	-0/+2
*	Collect merge-related tests to t64xx	Elijah Newren	2020-08-11	1	-0/+4693