summaryrefslogtreecommitdiffstats
path: root/unpack-trees.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/clone-case-smashing-warning'Junio C Hamano2018-09-171-0/+1
|\
| * clone: report duplicate entries on case-insensitive filesystemsDuy Nguyen2018-08-171-0/+1
* | Merge branch 'en/incl-forward-decl'Junio C Hamano2018-08-201-1/+4
|\ \
| * | Add missing includes and forward declarationsElijah Newren2018-08-151-1/+4
| |/
* / unpack-trees: remove 'extern' on function declarationNguyễn Thái Ngọc Duy2018-08-131-2/+2
|/
* unpack_trees_options: free messages when doneMartin Ågren2018-05-221-1/+7
* merge-recursive: fix overwriting dirty files involved in renamesElijah Newren2018-05-081-0/+4
* Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano2018-04-111-4/+0
* merge-recursive: fix overwriting dirty files involved in renamesElijah Newren2018-02-271-0/+4
* unpack-trees: check if we can perform the operation for submodulesStefan Beller2017-03-161-0/+1
* diff-lib, read-tree, unpack-trees: mark cache_entry array paramters constRené Scharfe2013-06-021-5/+9
* dir.c: replace is_path_excluded with now equivalent is_excluded APIKarsten Blees2013-04-151-1/+0
* unpack-trees.c: use path_excluded() in check_ok_to_remove()Junio C Hamano2012-06-051-0/+1
* Merge branch 'jc/diff-index-unpack'Junio C Hamano2011-10-051-0/+1
|\
| * unpack-trees: allow pruning with pathspecJunio C Hamano2011-08-291-0/+1
* | Merge branch 'jc/diff-index-quick-exit-early'Junio C Hamano2011-06-291-0/+1
|\ \ | |/ |/|
| * diff-index --quiet: learn the "stop feeding the backend early" logicJunio C Hamano2011-05-311-0/+1
* | unpack-trees: add the dry_run flag to unpack_trees_optionsJens Lehmann2011-05-251-1/+2
|/
* use persistent memory for rejected pathsClemens Buchacher2010-11-151-6/+3
* Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy2010-09-031-1/+1
* setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-031-1/+2
* Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-031-0/+6
* unpack_trees: group error messages by typeMatthieu Moy2010-08-111-1/+12
* merge-recursive: distinguish "removed" and "overwritten" messagesMatthieu Moy2010-08-111-2/+4
* Turn unpack_trees_options.msgs into an array + enumMatthieu Moy2010-08-111-9/+10
* Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-241-1/+2
|\
| * read-tree --debug-unpackJunio C Hamano2010-01-071-0/+1
| * unpack-trees.c: prepare for looking ahead in the indexJunio C Hamano2010-01-071-1/+1
* | unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final indexNguyễn Thái Ngọc Duy2009-08-231-0/+2
* | unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkoutNguyễn Thái Ngọc Duy2009-08-231-0/+4
|/
* read-tree: migrate to parse-optionsStephen Boyd2009-06-271-12/+12
* Optimize "diff-index --cached" using cache-treeJunio C Hamano2009-05-251-0/+1
* checkout: do not lose staged removalJunio C Hamano2008-09-091-0/+1
* 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