102 commits

Author	SHA1	Message	Date
Johannes Schindelin	076b0adcf9	read-tree: move merge functions to the library ... This will allow merge-recursive to use the read-tree functionality without exec()ing git-read-tree. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-07-30 23:31:39 -07:00
Johannes Schindelin	16da134b1f	read-trees: refactor the unpack_trees() part ... Basically, the options are passed by a struct unpack_trees_options now. That's all. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-07-30 23:31:31 -07:00