summaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAgeFilesLines
...
* | use persistent memory for rejected pathsClemens Buchacher2010-11-151-25/+11
* | do not overwrite files in leading pathClemens Buchacher2010-10-131-3/+13
* | add function check_ok_to_remove()Clemens Buchacher2010-10-131-49/+58
|/
* Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-031-7/+49
|\
| * Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy2010-09-031-6/+2
| * setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-031-1/+3
| * Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-031-1/+45
* | Merge branch 'nd/fix-sparse-checkout'Junio C Hamano2010-08-211-25/+31
|\ \
| * | unpack-trees: mark new entries skip-worktree appropriatelyNguyễn Thái Ngọc Duy2010-08-091-0/+2
| * | unpack-trees: do not check for conflict entries too earlyNguyễn Thái Ngọc Duy2010-08-091-4/+1
| * | unpack-trees: let read-tree -u remove index entries outside sparse areaNguyễn Thái Ngọc Duy2010-08-091-10/+19
| * | unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always setNguyễn Thái Ngọc Duy2010-08-091-14/+12
* | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-08-211-41/+124
|\ \ \ | | |/ | |/|
| * | unpack_trees: group error messages by typeMatthieu Moy2010-08-111-4/+74
| * | merge-recursive: distinguish "removed" and "overwritten" messagesMatthieu Moy2010-08-111-25/+39
| * | merge-recursive: porcelain messages for checkoutDiane Gasselin2010-08-111-3/+2
| * | Turn unpack_trees_options.msgs into an array + enumMatthieu Moy2010-08-111-21/+21
* | | read-tree: stop leaking tree objectsJonathan Nieder2010-08-111-1/+6
|/ /
* | Merge branch 'bd/maint-unpack-trees-parawalk-fix'Junio C Hamano2010-06-221-2/+10
|\ \
| * | unpack-trees: Make index lookahead less pessimalBrian Downing2010-06-181-2/+10
| |/
* | Merge branch 'gv/portable'Junio C Hamano2010-06-211-1/+3
|\ \
| * | Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan2010-05-311-1/+3
| |/
* | Merge branch 'cb/assume-unchanged-fix'Junio C Hamano2010-06-131-1/+1
|\ \
| * | do not overwrite files marked "assume unchanged"Clemens Buchacher2010-05-011-1/+1
| |/
* | Introduce remove_or_warn functionPeter Collingbourne2010-03-281-10/+2
|/
* Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-241-58/+331
|\
| * read-tree --debug-unpackJunio C Hamano2010-01-071-0/+35
| * unpack-trees.c: look ahead in the indexJunio C Hamano2010-01-071-3/+117
| * unpack-trees.c: prepare for looking ahead in the indexJunio C Hamano2010-01-071-46/+170
| * Aggressive three-way merge: fix D/F caseJunio C Hamano2010-01-031-5/+8
* | Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'Junio C Hamano2010-01-181-2/+10
|\ \
| * | Remove empty directories when checking out a commit with fewer submodulesPeter Collingbourne2010-01-111-2/+10
| |/
* | Merge branch 'cc/reset-more'Junio C Hamano2010-01-131-7/+14
|\ \
| * | "reset --merge": fix unmerged caseJunio C Hamano2010-01-031-7/+14
| |/
* | Merge branch 'nd/sparse'Junio C Hamano2010-01-131-18/+163
|\ \ | |/ |/|
| * ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALIDNguyễn Thái Ngọc Duy2009-12-141-3/+3
| * sparse checkout: inhibit empty worktreeNguyễn Thái Ngọc Duy2009-08-231-0/+7
| * unpack-trees(): ignore worktree check outside checkout areaNguyễn Thái Ngọc Duy2009-08-231-0/+12
| * unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final indexNguyễn Thái Ngọc Duy2009-08-231-1/+81
| * unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkoutNguyễn Thái Ngọc Duy2009-08-231-6/+30
| * unpack-trees.c: generalize verify_* functionsNguyễn Thái Ngọc Duy2009-08-231-5/+18
| * unpack-trees(): add CE_WT_REMOVE to remove on worktree aloneNguyễn Thái Ngọc Duy2009-08-231-1/+8
| * unpack-trees(): carry skip-worktree bit over in merged_entry()Nguyễn Thái Ngọc Duy2009-08-231-0/+2
| * Teach Git to respect skip-worktree bit (writing part)Nguyễn Thái Ngọc Duy2009-08-231-2/+2
* | Merge branch 'jc/fix-tree-walk' (early part)Junio C Hamano2009-11-201-13/+13
|\ \
| * | unpack_callback(): use unpack_failed() consistentlyJunio C Hamano2009-10-111-12/+12
| * | unpack-trees: typofixJunio C Hamano2009-10-111-1/+1
| |/
* | Use 'fast-forward' all over the placeFelipe Contreras2009-10-241-1/+1
|/
* Merge branch 'maint'Junio C Hamano2009-07-181-1/+1
|\
| * checkout -f: deal with a D/F conflict entry correctlyJunio C Hamano2009-07-181-1/+1
View Lorry Controller Status