git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	merge: fix leaking merge bases	Patrick Steinhardt	2024-06-11	1	-0/+1
*	tests: teach callers of test_i18ngrep to use test_grep	Junio C Hamano	2023-11-02	1	-8/+8
*	merge: do not abort early if one strategy fails to handle the merge	Elijah Newren	2022-07-23	1	-1/+1
*	Merge branch 'en/pull-conflicting-options'	Junio C Hamano	2021-08-31	1	-9/+9
\|\
\| *	pull: abort by default when fast-forwarding is not possible	Elijah Newren	2021-07-22	1	-9/+9
* \|	t6402: preserve git exit status code	Đoàn Trần Công Danh	2021-07-06	1	-68/+64
\|/
*	t6[4-9]*: adjust the references to the default branch name "main"	Johannes Schindelin	2020-11-20	1	-24/+24
*	tests: mark tests relying on the current default for `init.defaultBranch`	Johannes Schindelin	2020-11-20	1	-0/+3
*	merge tests: expect slight differences in output for recursive vs. ort	Elijah Newren	2020-10-26	1	-2/+12
*	merge tests: expect improved directory/file conflict handling in ort	Elijah Newren	2020-10-26	1	-27/+81
*	Collect merge-related tests to t64xx	Elijah Newren	2020-08-11	1	-0/+910