git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'as/doc-markup-fix'	Junio C Hamano	2023-03-19	1	-1/+1
\|\
\| *	git-merge-tree.txt: replace spurious HTML entity	Andreas Schwab	2023-03-06	1	-1/+1
* \|	docs: fix description of the `--merge-base` option	Kyle Zhao	2022-11-25	1	-2/+2
* \|	merge-tree.c: allow specifying the merge-base when --stdin is passed	Kyle Zhao	2022-11-13	1	-1/+13
* \|	merge-tree.c: add --merge-base=<commit> option	Kyle Zhao	2022-11-13	1	-0/+4
\|/
*	merge-tree: support multiple batched merges with --stdin	Elijah Newren	2022-10-23	1	-1/+29
*	merge-tree: update documentation for differences in -z output	Elijah Newren	2022-10-23	1	-7/+39
*	git-merge-tree.txt: add a section on potentional usage mistakes	Elijah Newren	2022-06-23	1	-0/+53
*	merge-tree: add a --allow-unrelated-histories flag	Elijah Newren	2022-06-23	1	-0/+5
*	merge-tree: allow `ls-files -u` style info to be NUL terminated	Elijah Newren	2022-06-23	1	-4/+17
*	merge-tree: provide easy access to `ls-files -u` style info	Elijah Newren	2022-06-23	1	-6/+28
*	merge-tree: provide a list of which files have conflicts	Elijah Newren	2022-06-23	1	-0/+9
*	merge-tree: support including merge messages in output	Elijah Newren	2022-06-23	1	-6/+41
*	merge-tree: implement real merges	Elijah Newren	2022-06-23	1	-12/+86
*	use 'tree-ish' instead of 'treeish'	Richard Hansen	2013-09-05	1	-1/+1
*	Documentation: use [verse] for SYNOPSIS sections	Martin von Zweigbergk	2011-07-06	1	-0/+1
*	doc: drop author/documentation sections from most pages	Jeff King	2011-03-11	1	-8/+0
*	Improve language in git-merge.txt and related docs	Ralf Wildenhues	2008-12-10	1	-3/+3
*	Documentation: be consistent about "git-" versus "git "	Jonathan Nieder	2008-07-02	1	-1/+1
*	documentation: move git(7) to git(1)	Christian Couder	2008-06-06	1	-1/+1
*	Documentation: rename gitlink macro to linkgit	Dan McGee	2008-01-07	1	-1/+1
*	War on whitespace	Junio C Hamano	2007-06-07	1	-1/+0
*	Documentation: add a couple of missing docs.	Junio C Hamano	2006-04-13	1	-0/+37