| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
| * | | unpack-trees: fix path search bug in verify_absent | Clemens Buchacher | 2009-01-05 | 1 | -10/+10 |
| * | | unpack-trees: handle failure in verify_absent | Clemens Buchacher | 2009-01-05 | 1 | -3/+5 |
| |/ |
|
* | | Fix non-literal format in printf-style calls | Daniel Lowe | 2008-11-11 | 1 | -1/+1 |
* | | correct cache_entry allocation | Jeff King | 2008-11-01 | 1 | -1/+1 |
* | | checkout: do not lose staged removal | Junio C Hamano | 2008-09-09 | 1 | -1/+10 |
* | | unpack_trees(): protect the handcrafted in-core index from read_cache() | Junio C Hamano | 2008-08-23 | 1 | -0/+1 |
|/ |
|
* | unpack_trees(): allow callers to differentiate worktree errors from merge errors | Junio C Hamano | 2008-05-29 | 1 | -3/+7 |
* | unpack-trees: allow Porcelain to give different error messages | Junio C Hamano | 2008-05-19 | 1 | -14/+41 |
* | Optimize symlink/directory detection | Linus Torvalds | 2008-05-10 | 1 | -7/+5 |
* | Make unpack-tree update removed files before any updated files | Linus Torvalds | 2008-04-09 | 1 | -2/+7 |
* | Make branch merging aware of underlying case-insensitive filsystems | Linus Torvalds | 2008-04-09 | 1 | -0/+26 |
* | Make hash_name_lookup able to do case-independent lookups | Linus Torvalds | 2008-04-09 | 1 | -1/+1 |
* | Make "index_name_exists()" return the cache_entry it found | Linus Torvalds | 2008-04-09 | 1 | -4/+4 |
* | Fix read-tree not to discard errors | Junio C Hamano | 2008-03-18 | 1 | -3/+6 |
* | Don't update unchanged merge entries | Linus Torvalds | 2008-03-16 | 1 | -3/+6 |
* | Fix recent 'unpack_trees()'-related changes breaking 'git stash' | Linus Torvalds | 2008-03-14 | 1 | -0/+2 |
* | read-tree() and unpack_trees(): use consistent limit | Junio C Hamano | 2008-03-13 | 1 | -3/+3 |
* | unpack_trees(): fix diff-index regression. | Linus Torvalds | 2008-03-10 | 1 | -2/+0 |
* | traverse_trees_recursive(): propagate merge errors up | Junio C Hamano | 2008-03-10 | 1 | -3/+4 |
* | unpack_trees(): minor memory leak fix in unused destination index | Linus Torvalds | 2008-03-09 | 1 | -0/+1 |
* | Make 'unpack_trees()' have a separate source and destination index | Linus Torvalds | 2008-03-09 | 1 | -77/+72 |
* | Make 'unpack_trees()' take the index to work on as an argument | Linus Torvalds | 2008-03-09 | 1 | -39/+40 |
* | Move 'unpack_trees()' over to 'traverse_trees()' interface | Linus Torvalds | 2008-03-09 | 1 | -281/+249 |