| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jc/fix-tree-walk' | Junio C Hamano | 2010-01-24 | 1 | -58/+331 |
|\ |
|
| * | read-tree --debug-unpack | Junio C Hamano | 2010-01-07 | 1 | -0/+35 |
| * | unpack-trees.c: look ahead in the index | Junio C Hamano | 2010-01-07 | 1 | -3/+117 |
| * | unpack-trees.c: prepare for looking ahead in the index | Junio C Hamano | 2010-01-07 | 1 | -46/+170 |
| * | Aggressive three-way merge: fix D/F case | Junio C Hamano | 2010-01-03 | 1 | -5/+8 |
* | | Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches' | Junio C Hamano | 2010-01-18 | 1 | -2/+10 |
|\ \ |
|
| * | | Remove empty directories when checking out a commit with fewer submodules | Peter Collingbourne | 2010-01-11 | 1 | -2/+10 |
| |/ |
|
* | | Merge branch 'cc/reset-more' | Junio C Hamano | 2010-01-13 | 1 | -7/+14 |
|\ \ |
|
| * | | "reset --merge": fix unmerged case | Junio C Hamano | 2010-01-03 | 1 | -7/+14 |
| |/ |
|
* | | Merge branch 'nd/sparse' | Junio C Hamano | 2010-01-13 | 1 | -18/+163 |
|\ \
| |/
|/| |
|
| * | ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID | Nguyễn Thái Ngọc Duy | 2009-12-14 | 1 | -3/+3 |
| * | sparse checkout: inhibit empty worktree | Nguyễn Thái Ngọc Duy | 2009-08-23 | 1 | -0/+7 |
| * | unpack-trees(): ignore worktree check outside checkout area | Nguyễn Thái Ngọc Duy | 2009-08-23 | 1 | -0/+12 |
| * | unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index | Nguyễn Thái Ngọc Duy | 2009-08-23 | 1 | -1/+81 |
| * | unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout | Nguyễn Thái Ngọc Duy | 2009-08-23 | 1 | -6/+30 |
| * | unpack-trees.c: generalize verify_* functions | Nguyễn Thái Ngọc Duy | 2009-08-23 | 1 | -5/+18 |
| * | unpack-trees(): add CE_WT_REMOVE to remove on worktree alone | Nguyễn Thái Ngọc Duy | 2009-08-23 | 1 | -1/+8 |
| * | unpack-trees(): carry skip-worktree bit over in merged_entry() | Nguyễn Thái Ngọc Duy | 2009-08-23 | 1 | -0/+2 |
| * | Teach Git to respect skip-worktree bit (writing part) | Nguyễn Thái Ngọc Duy | 2009-08-23 | 1 | -2/+2 |
* | | Merge branch 'jc/fix-tree-walk' (early part) | Junio C Hamano | 2009-11-20 | 1 | -13/+13 |
|\ \ |
|
| * | | unpack_callback(): use unpack_failed() consistently | Junio C Hamano | 2009-10-11 | 1 | -12/+12 |
| * | | unpack-trees: typofix | Junio C Hamano | 2009-10-11 | 1 | -1/+1 |
| |/ |
|
* | | Use 'fast-forward' all over the place | Felipe Contreras | 2009-10-24 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'maint' | Junio C Hamano | 2009-07-18 | 1 | -1/+1 |
|\ |
|
| * | checkout -f: deal with a D/F conflict entry correctly | Junio C Hamano | 2009-07-18 | 1 | -1/+1 |
* | | Fix extraneous lstat's in 'git checkout -f' | Linus Torvalds | 2009-07-14 | 1 | -1/+1 |
* | | unpack-trees.c: work around run-time array initialization flaw on IRIX 6.5 | Brandon Casey | 2009-07-10 | 1 | -1/+1 |
* | | Simplify read_directory[_recursive]() arguments | Linus Torvalds | 2009-07-09 | 1 | -1/+1 |
* | | Fix various sparse warnings in the git source code | Linus Torvalds | 2009-06-20 | 1 | -1/+1 |
* | | Optimize "diff-index --cached" using cache-tree | Junio C Hamano | 2009-05-25 | 1 | -0/+17 |
|/ |
|
* | replace direct calls to unlink(2) with unlink_or_warn | Alex Riesen | 2009-04-29 | 1 | -1/+1 |
* | unpack-trees: do not muck with attributes when we are not checking out | Junio C Hamano | 2009-04-17 | 1 | -2/+4 |
* | Merge branch 'jc/attributes-checkout' | Junio C Hamano | 2009-03-26 | 1 | -0/+3 |
|\ |
|
| * | Read attributes from the index that is being checked out | Junio C Hamano | 2009-03-13 | 1 | -0/+3 |
* | | Merge branch 'jc/maint-1.6.0-read-tree-overlay' | Junio C Hamano | 2009-03-17 | 1 | -3/+3 |
|\ \ |
|
| * | | read-tree A B C: do not create a bogus index and do not segfault | Junio C Hamano | 2009-03-12 | 1 | -3/+3 |
* | | | Record ns-timestamps if possible, but do not use it without USE_NSEC | Kjetil Barvik | 2009-03-07 | 1 | -2/+0 |
* | | | verify_uptodate(): add ce_uptodate(ce) test | Kjetil Barvik | 2009-02-19 | 1 | -1/+1 |
* | | | make USE_NSEC work as expected | Kjetil Barvik | 2009-02-19 | 1 | -2/+6 |
* | | | check_updates(): effective removal of cache entries marked CE_REMOVE | Kjetil Barvik | 2009-02-18 | 1 | -3/+1 |
* | | | unlink_entry(): introduce schedule_dir_for_removal() | Kjetil Barvik | 2009-02-09 | 1 | -24/+6 |
* | | | lstat_cache(): swap func(length, string) into func(string, length) | Kjetil Barvik | 2009-02-09 | 1 | -2/+2 |
| |/
|/| |
|
* | | Merge branch 'maint' | Junio C Hamano | 2009-01-31 | 1 | -3/+6 |
|\ \ |
|
| * \ | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-01-31 | 1 | -3/+6 |
| |\ \ |
|
| | * | | merge: fix out-of-bounds memory access | René Scharfe | 2009-01-31 | 1 | -3/+6 |
| * | | | Merge branch 'cb/maint-unpack-trees-absense' into maint | Junio C Hamano | 2009-01-23 | 1 | -18/+16 |
| |\ \ \
| | |/ /
| |/| | |
|
* | | | | Merge branch 'kb/lstat-cache' | Junio C Hamano | 2009-01-25 | 1 | -2/+2 |
|\ \ \ \ |
|
| * | | | | lstat_cache(): introduce has_symlink_or_noent_leading_path() function | Kjetil Barvik | 2009-01-18 | 1 | -2/+2 |
| |/ / / |
|
* | | | | Merge branch 'cb/maint-unpack-trees-absense' | Junio C Hamano | 2009-01-13 | 1 | -18/+16 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * | | unpack-trees: remove redundant path search in verify_absent | Clemens Buchacher | 2009-01-05 | 1 | -6/+2 |