git - git

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \|	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
\| \| \|/ / \| \|/\| \|
* \| \| \|	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
\| \|/ / /