path: root/unpack-trees.c
AgeCommit message (Expand)Author
2010-09-04Merge branch 'dg/local-mod-error-messages'Junio C Hamano
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy
2010-08-22Merge branch 'nd/fix-sparse-checkout'Junio C Hamano
2010-08-22Merge branch 'dg/local-mod-error-messages'Junio C Hamano
2010-08-11unpack_trees: group error messages by typeMatthieu Moy
2010-08-11merge-recursive: distinguish "removed" and "overwritten" messagesMatthieu Moy
2010-08-11merge-recursive: porcelain messages for checkoutDiane Gasselin
2010-08-11Turn unpack_trees_options.msgs into an array + enumMatthieu Moy
2010-08-11read-tree: stop leaking tree objectsJonathan Nieder
2010-08-09unpack-trees: mark new entries skip-worktree appropriatelyNguyễn Thái Ngọc Duy
2010-08-09unpack-trees: do not check for conflict entries too earlyNguyễn Thái Ngọc Duy
2010-08-09unpack-trees: let read-tree -u remove index entries outside sparse areaNguyễn Thái Ngọc Duy
2010-08-09unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always setNguyễn Thái Ngọc Duy
2010-06-22Merge branch 'bd/maint-unpack-trees-parawalk-fix'Junio C Hamano
2010-06-21Merge branch 'gv/portable'Junio C Hamano
2010-06-18unpack-trees: Make index lookahead less pessimalBrian Downing
2010-06-13Merge branch 'cb/assume-unchanged-fix'Junio C Hamano
2010-05-31Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan
2010-05-01do not overwrite files marked "assume unchanged"Clemens Buchacher
2010-03-28Introduce remove_or_warn functionPeter Collingbourne
2010-01-25Merge branch 'jc/fix-tree-walk'Junio C Hamano
2010-01-19Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'Junio C Hamano
2010-01-13Merge branch 'cc/reset-more'Junio C Hamano
2010-01-13Merge branch 'nd/sparse'Junio C Hamano
2010-01-12Remove empty directories when checking out a commit with fewer submodulesPeter Collingbourne
2010-01-07read-tree --debug-unpackJunio C Hamano
2010-01-07unpack-trees.c: look ahead in the indexJunio C Hamano
2010-01-07unpack-trees.c: prepare for looking ahead in the indexJunio C Hamano
2010-01-04Aggressive three-way merge: fix D/F caseJunio C Hamano
2010-01-04"reset --merge": fix unmerged caseJunio C Hamano
2009-12-14ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALIDNguyễn Thái Ngọc Duy
2009-11-21Merge branch 'jc/fix-tree-walk' (early part)Junio C Hamano
2009-10-25Use 'fast-forward' all over the placeFelipe Contreras
2009-10-11unpack_callback(): use unpack_failed() consistentlyJunio C Hamano
2009-10-11unpack-trees: typofixJunio C Hamano
2009-08-24sparse checkout: inhibit empty worktreeNguyễn Thái Ngọc Duy
2009-08-24unpack-trees(): ignore worktree check outside checkout areaNguyễn Thái Ngọc Duy
2009-08-24unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final indexNguyễn Thái Ngọc Duy
2009-08-24unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkoutNguyễn Thái Ngọc Duy
2009-08-24unpack-trees.c: generalize verify_* functionsNguyễn Thái Ngọc Duy
2009-08-24unpack-trees(): add CE_WT_REMOVE to remove on worktree aloneNguyễn Thái Ngọc Duy
2009-08-24unpack-trees(): carry skip-worktree bit over in merged_entry()Nguyễn Thái Ngọc Duy
2009-08-24Teach Git to respect skip-worktree bit (writing part)Nguyễn Thái Ngọc Duy
2009-07-18Merge branch 'maint'Junio C Hamano
2009-07-18checkout -f: deal with a D/F conflict entry correctlyJunio C Hamano
2009-07-14Fix extraneous lstat's in 'git checkout -f'Linus Torvalds
2009-07-11unpack-trees.c: work around run-time array initialization flaw on IRIX 6.5Brandon Casey
2009-07-09Simplify read_directory[_recursive]() argumentsLinus Torvalds