git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	*: fix typos which duplicate a word	Andrei Rybak	2023-01-08	1	-2/+2
*	merge-tree.c: allow specifying the merge-base when --stdin is passed	Kyle Zhao	2022-11-13	1	-0/+35
*	merge-tree.c: add --merge-base=<commit> option	Kyle Zhao	2022-11-13	1	-0/+27
*	merge-tree: support multiple batched merges with --stdin	Elijah Newren	2022-10-23	1	-0/+41
*	merge-ort: fix segmentation fault in read-only repositories	Johannes Schindelin	2022-09-28	1	-0/+9
*	t4301: emit blank line in more idiomatic fashion	Eric Sunshine	2022-08-29	1	-10/+10
*	t4301: fix broken &&-chains and add missing loop termination	Eric Sunshine	2022-08-29	1	-2/+2
*	t4301: account for behavior differences between sed implementations	Eric Sunshine	2022-08-28	1	-1/+1
*	t4301: add more interesting merge-tree testcases	Elijah Newren	2022-08-24	1	-1/+573
*	leak tests: mark passing SANITIZE=leak tests as leak-free	Ævar Arnfjörð Bjarmason	2022-07-28	1	-0/+1
*	merge-tree: add a --allow-unrelated-histories flag	Elijah Newren	2022-06-23	1	-1/+23
*	merge-tree: allow `ls-files -u` style info to be NUL terminated	Elijah Newren	2022-06-23	1	-0/+42
*	merge-tree: provide easy access to `ls-files -u` style info	Elijah Newren	2022-06-23	1	-2/+24
*	merge-tree: provide a list of which files have conflicts	Elijah Newren	2022-06-23	1	-0/+11
*	merge-tree: support including merge messages in output	Elijah Newren	2022-06-23	1	-0/+37
*	merge-tree: implement real merges	Elijah Newren	2022-06-23	1	-0/+106