aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAge
* Merge branch 'pc/remove-warn' into maintJunio C Hamano2010-06-22
|\
| * Introduce remove_or_warn functionPeter Collingbourne2010-03-28
* | do not overwrite files marked "assume unchanged"Clemens Buchacher2010-05-01
|/
* Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-24
|\
| * read-tree --debug-unpackJunio C Hamano2010-01-07
| * unpack-trees.c: look ahead in the indexJunio C Hamano2010-01-07
| * unpack-trees.c: prepare for looking ahead in the indexJunio C Hamano2010-01-07
| * Aggressive three-way merge: fix D/F caseJunio C Hamano2010-01-03
* | Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'Junio C Hamano2010-01-18
|\ \
| * | Remove empty directories when checking out a commit with fewer submodulesPeter Collingbourne2010-01-11
| |/
* | Merge branch 'cc/reset-more'Junio C Hamano2010-01-13
|\ \
| * | "reset --merge": fix unmerged caseJunio C Hamano2010-01-03
| |/
* | Merge branch 'nd/sparse'Junio C Hamano2010-01-13
|\ \ | |/ |/|
| * ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALIDNguyễn Thái Ngọc Duy2009-12-14
| * sparse checkout: inhibit empty worktreeNguyễn Thái Ngọc Duy2009-08-23
| * unpack-trees(): ignore worktree check outside checkout areaNguyễn Thái Ngọc Duy2009-08-23
| * unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final indexNguyễn Thái Ngọc Duy2009-08-23
| * unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkoutNguyễn Thái Ngọc Duy2009-08-23
| * unpack-trees.c: generalize verify_* functionsNguyễn Thái Ngọc Duy2009-08-23
| * unpack-trees(): add CE_WT_REMOVE to remove on worktree aloneNguyễn Thái Ngọc Duy2009-08-23
| * unpack-trees(): carry skip-worktree bit over in merged_entry()Nguyễn Thái Ngọc Duy2009-08-23
| * Teach Git to respect skip-worktree bit (writing part)Nguyễn Thái Ngọc Duy2009-08-23
* | Merge branch 'jc/fix-tree-walk' (early part)Junio C Hamano2009-11-20
|\ \
| * | unpack_callback(): use unpack_failed() consistentlyJunio C Hamano2009-10-11
| * | unpack-trees: typofixJunio C Hamano2009-10-11
| |/
* | Use 'fast-forward' all over the placeFelipe Contreras2009-10-24
|/
* Merge branch 'maint'Junio C Hamano2009-07-18
|\
| * checkout -f: deal with a D/F conflict entry correctlyJunio C Hamano2009-07-18
* | Fix extraneous lstat's in 'git checkout -f'Linus Torvalds2009-07-14
* | unpack-trees.c: work around run-time array initialization flaw on IRIX 6.5Brandon Casey2009-07-10
* | Simplify read_directory[_recursive]() argumentsLinus Torvalds2009-07-09
* | Fix various sparse warnings in the git source codeLinus Torvalds2009-06-20
* | Optimize "diff-index --cached" using cache-treeJunio C Hamano2009-05-25
|/
* replace direct calls to unlink(2) with unlink_or_warnAlex Riesen2009-04-29
* unpack-trees: do not muck with attributes when we are not checking outJunio C Hamano2009-04-17
* Merge branch 'jc/attributes-checkout'Junio C Hamano2009-03-26
|\
| * Read attributes from the index that is being checked outJunio C Hamano2009-03-13
* | Merge branch 'jc/maint-1.6.0-read-tree-overlay'Junio C Hamano2009-03-17
|\ \
| * | read-tree A B C: do not create a bogus index and do not segfaultJunio C Hamano2009-03-12
* | | Record ns-timestamps if possible, but do not use it without USE_NSECKjetil Barvik2009-03-07
* | | verify_uptodate(): add ce_uptodate(ce) testKjetil Barvik2009-02-19
* | | make USE_NSEC work as expectedKjetil Barvik2009-02-19
* | | check_updates(): effective removal of cache entries marked CE_REMOVEKjetil Barvik2009-02-18
* | | unlink_entry(): introduce schedule_dir_for_removal()Kjetil Barvik2009-02-09
* | | lstat_cache(): swap func(length, string) into func(string, length)Kjetil Barvik2009-02-09
| |/ |/|
* | Merge branch 'maint'Junio C Hamano2009-01-31
|\ \
| * \ Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-31
| |\ \
| | * | merge: fix out-of-bounds memory accessRené Scharfe2009-01-31
| * | | Merge branch 'cb/maint-unpack-trees-absense' into maintJunio C Hamano2009-01-23
| |\ \ \ | | |/ / | |/| |
* | | | Merge branch 'kb/lstat-cache'Junio C Hamano2009-01-25
|\ \ \ \
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-29 19:02:07 +0000