summaryrefslogtreecommitdiff
path: root/unpack-trees.h
AgeCommit message (Expand)AuthorFilesLines
2010-12-14use persistent memory for rejected pathsLibravatar Clemens Buchacher1-6/+3
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Libravatar Matthieu Moy1-1/+1
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterLibravatar Matthieu Moy1-1/+2
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itLibravatar Matthieu Moy1-0/+6
2010-08-11unpack_trees: group error messages by typeLibravatar Matthieu Moy1-1/+12
2010-08-11merge-recursive: distinguish "removed" and "overwritten" messagesLibravatar Matthieu Moy1-2/+4
2010-08-11Turn unpack_trees_options.msgs into an array + enumLibravatar Matthieu Moy1-9/+10
2010-01-24Merge branch 'jc/fix-tree-walk'Libravatar Junio C Hamano1-1/+2
2010-01-07read-tree --debug-unpackLibravatar Junio C Hamano1-0/+1
2010-01-07unpack-trees.c: prepare for looking ahead in the indexLibravatar Junio C Hamano1-1/+1
2009-08-23unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final indexLibravatar Nguyễn Thái Ngọc Duy1-0/+2
2009-08-23unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkoutLibravatar Nguyễn Thái Ngọc Duy1-0/+4
2009-06-27read-tree: migrate to parse-optionsLibravatar Stephen Boyd1-12/+12
2009-05-25Optimize "diff-index --cached" using cache-treeLibravatar Junio C Hamano1-0/+1
2008-09-09checkout: do not lose staged removalLibravatar Junio C Hamano1-0/+1
2008-05-19unpack-trees: allow Porcelain to give different error messagesLibravatar Junio C Hamano1-0/+9
2008-04-09Make branch merging aware of underlying case-insensitive filsystemsLibravatar Linus Torvalds1-1/+1
2008-04-09Make unpack_trees_options bit flags actual bitfieldsLibravatar Linus Torvalds1-10/+10
2008-03-13read-tree() and unpack_trees(): use consistent limitLibravatar Junio C Hamano1-0/+2
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLibravatar Linus Torvalds1-7/+9
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLibravatar Linus Torvalds1-0/+1
2008-02-09Add "skip_unmerged" option to unpack_trees.Libravatar Daniel Barkalow1-0/+1
2008-02-09Add flag to make unpack_trees() not print errors.Libravatar Daniel Barkalow1-0/+1
2008-01-21Make run_diff_index() use unpack_trees(), not read_tree()Libravatar Linus Torvalds1-0/+1
2007-08-10Move old index entry removal from "unpack_trees()" into the individual functionsLibravatar Linus Torvalds1-5/+6
2007-08-10Start moving unpack-trees to "struct tree_desc"Libravatar Linus Torvalds1-1/+1
2007-04-04unpack-trees: get rid of *indpos parameter.Libravatar Junio C Hamano1-0/+1
2006-12-05read-tree: further loosen "working file will be lost" check.Libravatar Junio C Hamano1-0/+1
2006-07-30read-tree: move merge functions to the libraryLibravatar Johannes Schindelin1-0/+5
2006-07-30read-trees: refactor the unpack_trees() partLibravatar Johannes Schindelin1-0/+30