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

	Commit message (Expand)	Author	Age
...
* \|	make progress "title" part of the common progress interface	Nicolas Pitre	2007-04-22
* \|	common progress display support	Nicolas Pitre	2007-04-22
* \|	Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()	Junio C Hamano	2007-04-10
* \|	t1000: fix case table.	Junio C Hamano	2007-04-10
* \|	Fix switching to a branch with D/F when current branch has file D.	Junio C Hamano	2007-04-04
* \|	Fix twoway_merge that passed d/f conflict marker to merged_entry().	Junio C Hamano	2007-04-04
* \|	unpack-trees: get rid of *indpos parameter.	Junio C Hamano	2007-04-04
* \|	unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.	Junio C Hamano	2007-04-04
\|/
*	Initialize tree descriptors with a helper function rather than by hand.	Linus Torvalds	2007-03-21
*	simplify inclusion of system header files.	Junio C Hamano	2006-12-20
*	Merge branch 'jc/read-tree-ignore'	Junio C Hamano	2006-12-13
\|\
\| *	read-tree: further loosen "working file will be lost" check.	Junio C Hamano	2006-12-05
* \|	unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.	Junio C Hamano	2006-12-04
\|/
*	merge: loosen overcautious "working file will be lost" check.	Junio C Hamano	2006-10-27
*	Convert memcpy(a,b,20) to hashcpy(a,b).	Shawn Pearce	2006-08-23
*	Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.	David Rientjes	2006-08-17
*	remove unnecessary initializations	David Rientjes	2006-08-15
*	use appropriate typedefs	David Rientjes	2006-08-15
*	read-tree: move merge functions to the library	Johannes Schindelin	2006-07-30
*	read-trees: refactor the unpack_trees() part	Johannes Schindelin	2006-07-30