git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'en/ort-dir-rename-and-symlink-fix'	Taylor Blau	2022-10-31	1	-2/+34
\|\
\| *	merge-ort: fix bug with dir rename vs change dir to symlink	Elijah Newren	2022-10-23	1	-2/+34
* \|	Merge branch 'jk/unused-anno-more'	Junio C Hamano	2022-10-27	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	string-list: mark unused callback parameters	Jeff King	2022-10-18	1	-1/+1
* \|	merge-ort: return early when failing to write a blob	Johannes Schindelin	2022-09-28	1	-9/+19
* \|	merge-ort: fix segmentation fault in read-only repositories	Johannes Schindelin	2022-09-28	1	-25/+41
\|/
*	Merge branch 'en/ort-unused-code-removal'	Junio C Hamano	2022-08-29	1	-20/+2
\|\
\| *	merge-ort: remove code obsoleted by other changes	Elijah Newren	2022-08-19	1	-20/+2
* \|	Merge branch 'en/submodule-merge-messages-fixes'	Junio C Hamano	2022-08-25	1	-9/+116
\|\ \ \| \|/ \|/\|
\| *	merge-ort: provide helpful submodule update message when possible	Elijah Newren	2022-08-18	1	-11/+7
\| *	merge-ort: avoid surprise with new sub_flag variable	Elijah Newren	2022-08-18	1	-1/+1
\| *	merge-ort: remove translator lego in new "submodule conflict suggestion"	Elijah Newren	2022-08-18	1	-60/+28
\| *	submodule merge: update conflict error message	Calvin Wan	2022-08-04	1	-9/+152
* \|	Merge branch 'js/ort-clean-up-after-failed-merge'	Junio C Hamano	2022-08-08	1	-0/+5
\|\ \ \| \|/ \|/\|
\| *	merge-ort: do leave trace2 region even if checkout fails	Johannes Schindelin	2022-08-01	1	-0/+3
\| *	merge-ort: clean up after failed merge	Johannes Schindelin	2022-08-01	1	-0/+2
* \|	Merge branch 'en/merge-dual-dir-renames-fix'	Junio C Hamano	2022-07-18	1	-26/+48
\|\ \
\| * \|	merge-ort: fix issue with dual rename and add/add conflict	Elijah Newren	2022-07-06	1	-1/+7
\| * \|	merge-ort: shuffle the computation and cleanup of potential collisions	Elijah Newren	2022-07-06	1	-5/+15
\| * \|	merge-ort: make a separate function for freeing struct collisions	Elijah Newren	2022-07-06	1	-16/+22
\| * \|	merge-ort: small cleanups of check_for_directory_rename	Elijah Newren	2022-07-06	1	-6/+6
* \| \|	merge-ort: optionally produce machine-readable output	Elijah Newren	2022-06-23	1	-2/+20
* \| \|	merge-ort: store more specific conflict information	Elijah Newren	2022-06-23	1	-55/+212
* \| \|	merge-ort: make `path_messages` a strmap to a string_list	Johannes Schindelin	2022-06-23	1	-33/+1
* \| \|	merge-ort: store messages in a list, not in a single strbuf	Johannes Schindelin	2022-06-23	1	-43/+80
* \| \|	merge-ort: remove command-line-centric submodule message from merge-ort	Elijah Newren	2022-06-23	1	-8/+1
* \| \|	merge-ort: provide a merge_get_conflicted_files() helper function	Elijah Newren	2022-06-23	1	-0/+31
* \| \|	merge-ort: split out a separate display_update_messages() function	Elijah Newren	2022-06-23	1	-37/+41
* \| \|	Merge branch 'ab/plug-leak-in-revisions'	Junio C Hamano	2022-06-07	1	-0/+1
\|\ \ \
\| * \| \|	revisions API users: add straightforward release_revisions()	Ævar Arnfjörð Bjarmason	2022-04-14	1	-0/+1
\| \|/ /
* \| \|	Merge branch 'ep/maint-equals-null-cocci'	Junio C Hamano	2022-05-21	1	-2/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Merge branch 'ep/maint-equals-null-cocci' for maint-2.35	Junio C Hamano	2022-05-02	1	-2/+2
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	tree-wide: apply equals-null.cocci	Junio C Hamano	2022-05-02	1	-2/+2
* \| \|	Merge branch 'ab/string-list-count-in-size-t'	Junio C Hamano	2022-03-17	1	-2/+2
\|\ \ \
\| * \| \|	string-list API: change "nr" and "alloc" to "size_t"	Ævar Arnfjörð Bjarmason	2022-03-07	1	-2/+2
* \| \| \|	Merge branch 'ab/object-file-api-updates'	Junio C Hamano	2022-03-17	1	-2/+2
\|\ \ \ \
\| * \| \| \|	object-file API: have write_object_file() take "enum object_type"	Ævar Arnfjörð Bjarmason	2022-02-26	1	-2/+2
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'en/merge-ort-align-verbosity-with-recursive'	Junio C Hamano	2022-03-13	1	-2/+3
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	merge-ort: exclude messages from inner merges by default	Elijah Newren	2022-03-02	1	-2/+3
* \| \| \|	Merge branch 'en/merge-ort-plug-leaks'	Junio C Hamano	2022-03-07	1	-19/+17
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	merge-ort: fix small memory leak in unique_path()	Elijah Newren	2022-02-20	1	-9/+12
\| * \| \|	merge-ort: fix small memory leak in detect_and_process_renames()	Elijah Newren	2022-02-20	1	-10/+5
* \| \| \|	merge-ort: make informational messages from recursive merges clearer	Elijah Newren	2022-02-18	1	-0/+5
\|/ / /
* \| \|	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
\| \| \|/ \| \|/\|