summaryrefslogtreecommitdiff
path: root/unpack-trees.h
AgeCommit message (Expand)Author
2008-09-10checkout: do not lose staged removalJunio C Hamano
2008-05-20unpack-trees: allow Porcelain to give different error messagesJunio C Hamano
2008-04-09Make branch merging aware of underlying case-insensitive filsystemsLinus Torvalds
2008-04-09Make unpack_trees_options bit flags actual bitfieldsLinus Torvalds
2008-03-14read-tree() and unpack_trees(): use consistent limitJunio C Hamano
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds
2008-02-10Add "skip_unmerged" option to unpack_trees.Daniel Barkalow
2008-02-10Add flag to make unpack_trees() not print errors.Daniel Barkalow
2008-01-21Make run_diff_index() use unpack_trees(), not read_tree()Linus Torvalds
2007-08-10Move old index entry removal from "unpack_trees()" into the individual functionsLinus Torvalds
2007-08-10Start moving unpack-trees to "struct tree_desc"Linus Torvalds
2007-04-04unpack-trees: get rid of *indpos parameter.Junio C Hamano
2006-12-06read-tree: further loosen "working file will be lost" check.Junio C Hamano
2006-07-31read-tree: move merge functions to the libraryJohannes Schindelin
2006-07-31read-trees: refactor the unpack_trees() partJohannes Schindelin