summaryrefslogtreecommitdiff
path: root/unpack-trees.c
AgeCommit message (Expand)AuthorFilesLines
2010-12-14do not overwrite files in leading pathLibravatar Clemens Buchacher1-3/+13
2010-12-14add function check_ok_to_remove()Libravatar Clemens Buchacher1-49/+58
2010-09-03Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano1-7/+49
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Libravatar Matthieu Moy1-6/+2
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterLibravatar Matthieu Moy1-1/+3
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itLibravatar Matthieu Moy1-1/+45
2010-08-21Merge branch 'nd/fix-sparse-checkout'Libravatar Junio C Hamano1-25/+31
2010-08-21Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano1-41/+124
2010-08-11unpack_trees: group error messages by typeLibravatar Matthieu Moy1-4/+74
2010-08-11merge-recursive: distinguish "removed" and "overwritten" messagesLibravatar Matthieu Moy1-25/+39
2010-08-11merge-recursive: porcelain messages for checkoutLibravatar Diane Gasselin1-3/+2
2010-08-11Turn unpack_trees_options.msgs into an array + enumLibravatar Matthieu Moy1-21/+21
2010-08-11read-tree: stop leaking tree objectsLibravatar Jonathan Nieder1-1/+6
2010-08-09unpack-trees: mark new entries skip-worktree appropriatelyLibravatar Nguyễn Thái Ngọc Duy1-0/+2
2010-08-09unpack-trees: do not check for conflict entries too earlyLibravatar Nguyễn Thái Ngọc Duy1-4/+1
2010-08-09unpack-trees: let read-tree -u remove index entries outside sparse areaLibravatar Nguyễn Thái Ngọc Duy1-10/+19
2010-08-09unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always setLibravatar Nguyễn Thái Ngọc Duy1-14/+12
2010-06-22Merge branch 'bd/maint-unpack-trees-parawalk-fix'Libravatar Junio C Hamano1-2/+10
2010-06-21Merge branch 'gv/portable'Libravatar Junio C Hamano1-1/+3
2010-06-18unpack-trees: Make index lookahead less pessimalLibravatar Brian Downing1-2/+10
2010-06-13Merge branch 'cb/assume-unchanged-fix'Libravatar Junio C Hamano1-1/+1
2010-05-31Rewrite dynamic structure initializations to runtime assignmentLibravatar Gary V. Vaughan1-1/+3
2010-05-01do not overwrite files marked "assume unchanged"Libravatar Clemens Buchacher1-1/+1
2010-03-28Introduce remove_or_warn functionLibravatar Peter Collingbourne1-10/+2
2010-01-24Merge branch 'jc/fix-tree-walk'Libravatar Junio C Hamano1-58/+331
2010-01-18Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'Libravatar Junio C Hamano1-2/+10
2010-01-13Merge branch 'cc/reset-more'Libravatar Junio C Hamano1-7/+14
2010-01-13Merge branch 'nd/sparse'Libravatar Junio C Hamano1-18/+163
2010-01-11Remove empty directories when checking out a commit with fewer submodulesLibravatar Peter Collingbourne1-2/+10
2010-01-07read-tree --debug-unpackLibravatar Junio C Hamano1-0/+35
2010-01-07unpack-trees.c: look ahead in the indexLibravatar Junio C Hamano1-3/+117
2010-01-07unpack-trees.c: prepare for looking ahead in the indexLibravatar Junio C Hamano1-46/+170
2010-01-03Aggressive three-way merge: fix D/F caseLibravatar Junio C Hamano1-5/+8
2010-01-03"reset --merge": fix unmerged caseLibravatar Junio C Hamano1-7/+14
2009-12-14ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALIDLibravatar Nguyễn Thái Ngọc Duy1-3/+3
2009-11-20Merge branch 'jc/fix-tree-walk' (early part)Libravatar Junio C Hamano1-13/+13
2009-10-24Use 'fast-forward' all over the placeLibravatar Felipe Contreras1-1/+1
2009-10-11unpack_callback(): use unpack_failed() consistentlyLibravatar Junio C Hamano1-12/+12
2009-10-11unpack-trees: typofixLibravatar Junio C Hamano1-1/+1
2009-08-23sparse checkout: inhibit empty worktreeLibravatar Nguyễn Thái Ngọc Duy1-0/+7
2009-08-23unpack-trees(): ignore worktree check outside checkout areaLibravatar Nguyễn Thái Ngọc Duy1-0/+12
2009-08-23unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final indexLibravatar Nguyễn Thái Ngọc Duy1-1/+81
2009-08-23unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkoutLibravatar Nguyễn Thái Ngọc Duy1-6/+30
2009-08-23unpack-trees.c: generalize verify_* functionsLibravatar Nguyễn Thái Ngọc Duy1-5/+18
2009-08-23unpack-trees(): add CE_WT_REMOVE to remove on worktree aloneLibravatar Nguyễn Thái Ngọc Duy1-1/+8
2009-08-23unpack-trees(): carry skip-worktree bit over in merged_entry()Libravatar Nguyễn Thái Ngọc Duy1-0/+2
2009-08-23Teach Git to respect skip-worktree bit (writing part)Libravatar Nguyễn Thái Ngọc Duy1-2/+2
2009-07-18Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2009-07-18checkout -f: deal with a D/F conflict entry correctlyLibravatar Junio C Hamano1-1/+1
2009-07-14Fix extraneous lstat's in 'git checkout -f'Libravatar Linus Torvalds1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 00:49:44 +0000