summaryrefslogtreecommitdiff
path: root/unpack-trees.h
Commit message (Expand)AuthorAgeFilesLines
* unpack-trees: allow Porcelain to give different error messagesJunio C Hamano2008-05-191-0/+9
* Make branch merging aware of underlying case-insensitive filsystemsLinus Torvalds2008-04-091-1/+1
* Make unpack_trees_options bit flags actual bitfieldsLinus Torvalds2008-04-091-10/+10
* read-tree() and unpack_trees(): use consistent limitJunio C Hamano2008-03-131-0/+2
* Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds2008-03-091-7/+9
* Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds2008-03-091-0/+1
* Add "skip_unmerged" option to unpack_trees.Daniel Barkalow2008-02-091-0/+1
* Add flag to make unpack_trees() not print errors.Daniel Barkalow2008-02-091-0/+1
* Make run_diff_index() use unpack_trees(), not read_tree()Linus Torvalds2008-01-211-0/+1
* Move old index entry removal from "unpack_trees()" into the individual functionsLinus Torvalds2007-08-101-5/+6
* Start moving unpack-trees to "struct tree_desc"Linus Torvalds2007-08-101-1/+1
* unpack-trees: get rid of *indpos parameter.Junio C Hamano2007-04-041-0/+1
* read-tree: further loosen "working file will be lost" check.Junio C Hamano2006-12-051-0/+1
* read-tree: move merge functions to the libraryJohannes Schindelin2006-07-301-0/+5
* read-trees: refactor the unpack_trees() partJohannes Schindelin2006-07-301-0/+30