summaryrefslogtreecommitdiff
path: root/unpack-trees.h
AgeCommit message (Collapse)Author
2006-07-31read-tree: move merge functions to the libraryJohannes Schindelin
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-31read-trees: refactor the unpack_trees() partJohannes Schindelin
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>