git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	Ensure index matches head before invoking merge machinery, round N	Elijah Newren	2019-08-19	1	-0/+4
*	Merge branch 'nd/the-index-final'	Junio C Hamano	2019-02-07	1	-1/+1
\|\
\| *	merge-recursive.c: remove implicit dependency on the_index	Nguyễn Thái Ngọc Duy	2019-01-14	1	-1/+1
* \|	merge-recursive: copy $GITHEAD strings	Jeff King	2019-01-12	1	-5/+10
\|/
*	builtin/merge-recursive: make hash independent	brian m. carlson	2018-07-16	1	-2/+2
*	i18n: merge-recursive: mark verbose message for translation	Vasco Almeida	2016-09-15	1	-1/+1
*	i18n: merge-recursive: mark error messages for translation	Vasco Almeida	2016-09-15	1	-7/+10
*	merge-recursive: convert merge_recursive_generic() to object_id	brian m. carlson	2016-06-28	1	-10/+10
*	convert trivial sprintf / strcpy calls to xsnprintf	Jeff King	2015-09-25	1	-1/+1
*	replace {pre,suf}fixcmp() with {starts,ends}_with()	Christian Couder	2013-12-05	1	-2/+2
*	Fix sparse warnings	Stephen Boyd	2011-03-22	1	-1/+1
*	Merge branch 'jf/merge-ignore-ws'	Junio C Hamano	2010-10-27	1	-13/+2
\|\
\| *	merge-recursive --patience	Justin Frankel	2010-08-26	1	-0/+1
\| *	merge-recursive: expose merge options for builtin merge	Jonathan Nieder	2010-08-26	1	-13/+1
* \|	Merge branch 'jn/merge-renormalize'	Junio C Hamano	2010-09-03	1	-0/+4
\|\\|
\| *	merge-recursive --renormalize	Jonathan Nieder	2010-08-06	1	-0/+4
* \|	builtin/merge_recursive.c: Add an usage string and make use of it.	Thiago Farina	2010-09-03	1	-1/+4
\|/
*	Move 'builtin-*' into a 'builtin/' subdirectory	Linus Torvalds	2010-02-22	1	-0/+84