aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.h
Commit message (Collapse)AuthorAge
* read-tree: move merge functions to the libraryJohannes Schindelin2006-07-30
| | | | | | | | 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>
* read-trees: refactor the unpack_trees() partJohannes Schindelin2006-07-30
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>