org/kernel/git.git - forked from git/git

	Commit message (Expand)	Author	Age
*	tree-walk: convert fill_tree_descriptor() to object_id	René Scharfe	2017-08-14
*	builtin/merge-tree: convert remaining caller of get_sha1 to object_id	brian m. carlson	2017-07-17
*	Convert lookup_blob to struct object_id	brian m. carlson	2017-05-08
*	Convert remaining callers of lookup_blob to object_id	brian m. carlson	2017-05-08
*	struct name_entry: use struct object_id instead of unsigned char sha1[20]	brian m. carlson	2016-04-25
*	use xmallocz to avoid size arithmetic	Jeff King	2016-02-22
*	Remove get_object_hash.	brian m. carlson	2015-11-20
*	Convert struct object to object_id	brian m. carlson	2015-11-20
*	Add several uses of get_object_hash.	brian m. carlson	2015-11-20
*	react to errors in xdi_diff	Jeff King	2015-09-28
*	merge-tree: remove unused df_conflict arguments	René Scharfe	2014-09-02
*	merge-tree: handle directory/empty conflict correctly	John Keeping	2013-05-06
*	merge-tree: fix typo in "both changed identically"	John Keeping	2013-04-28
*	merge-tree: don't print entries that match "local"	John Keeping	2013-04-08
*	merge-tree: fix typo in merge-tree.c::unresolved	John Keeping	2013-03-27
*	merge-tree: fix d/f conflicts	Junio C Hamano	2012-12-26
*	merge-tree: add comments to clarify what these functions are doing	Junio C Hamano	2012-12-26
*	merge-tree: lose unused "resolve_directories"	Junio C Hamano	2012-12-26
*	merge-tree: lose unused "flags" from merge_list	Junio C Hamano	2012-12-26
*	Which merge_file() function do you mean?	Junio C Hamano	2012-12-09
*	sparse: Fix an "symbol 'merge_file' not decared" warning	Ramsay Jones	2011-04-11
*	Fix sparse warnings	Stephen Boyd	2011-03-22
*	merge-tree: fix where two branches share no changes	Will Palmer	2010-07-14
*	Merge branch 'rs/diff-no-minimal' into maint	Junio C Hamano	2010-06-21
*	Move 'builtin-*' into a 'builtin/' subdirectory	Linus Torvalds	2010-02-22