summaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAgeFilesLines
* checkout: do not lose staged removalJunio C Hamano2008-09-091-1/+10
* unpack_trees(): protect the handcrafted in-core index from read_cache()Junio C Hamano2008-08-231-0/+1
* unpack_trees(): allow callers to differentiate worktree errors from merge errorsJunio C Hamano2008-05-291-3/+7
* unpack-trees: allow Porcelain to give different error messagesJunio C Hamano2008-05-191-14/+41
* Optimize symlink/directory detectionLinus Torvalds2008-05-101-7/+5
* Make unpack-tree update removed files before any updated filesLinus Torvalds2008-04-091-2/+7
* Make branch merging aware of underlying case-insensitive filsystemsLinus Torvalds2008-04-091-0/+26
* Make hash_name_lookup able to do case-independent lookupsLinus Torvalds2008-04-091-1/+1
* Make "index_name_exists()" return the cache_entry it foundLinus Torvalds2008-04-091-4/+4
* Fix read-tree not to discard errorsJunio C Hamano2008-03-181-3/+6
* Don't update unchanged merge entriesLinus Torvalds2008-03-161-3/+6
* Fix recent 'unpack_trees()'-related changes breaking 'git stash'Linus Torvalds2008-03-141-0/+2
* read-tree() and unpack_trees(): use consistent limitJunio C Hamano2008-03-131-3/+3
* unpack_trees(): fix diff-index regression.Linus Torvalds2008-03-101-2/+0
* traverse_trees_recursive(): propagate merge errors upJunio C Hamano2008-03-101-3/+4
* unpack_trees(): minor memory leak fix in unused destination indexLinus Torvalds2008-03-091-0/+1
* Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds2008-03-091-77/+72
* Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds2008-03-091-39/+40
* Move 'unpack_trees()' over to 'traverse_trees()' interfaceLinus Torvalds2008-03-091-281/+249
* Merge branch 'db/checkout'Junio C Hamano2008-02-271-56/+98
|\
| * Add "skip_unmerged" option to unpack_trees.Daniel Barkalow2008-02-091-3/+17
| * Discard "deleted" cache entries after using them to update the working treeDaniel Barkalow2008-02-091-7/+9
| * Send unpack-trees debugging output to stderrDaniel Barkalow2008-02-091-7/+7
| * Add flag to make unpack_trees() not print errors.Daniel Barkalow2008-02-091-14/+29
| * Allow callers of unpack_trees() to handle failureDaniel Barkalow2008-02-091-37/+48
* | Be more verbose when checkout takes a long timeLinus Torvalds2008-02-241-1/+1
* | Use helper function for copying index entry informationLinus Torvalds2008-02-221-1/+1
* | Merge branch 'jc/gitignore-ends-with-slash'Junio C Hamano2008-02-161-1/+2
|\ \ | |/ |/|
| * gitignore: lazily find dtypeJunio C Hamano2008-02-051-1/+2
| * gitignore(5): Allow "foo/" in ignore list to match directory "foo"Junio C Hamano2008-02-051-1/+1
* | Make on-disk index representation separate from in-core oneLinus Torvalds2008-01-211-15/+14
|/
* unpack-trees: FLEX_ARRAY fixLinus Torvalds2007-12-181-1/+1
* per-directory-exclude: lazily read .gitignore filesJunio C Hamano2007-11-291-6/+0
* Merge branch 'jc/maint-add-sync-stat'Junio C Hamano2007-11-141-2/+2
|\
| * ce_match_stat, run_diff_files: use symbolic constants for readabilityJunio C Hamano2007-11-101-2/+2
* | relax usage of the progress APINicolas Pitre2007-10-301-5/+3
* | make struct progress an opaque typeNicolas Pitre2007-10-301-5/+5
* | more compact progress displayNicolas Pitre2007-10-171-2/+2
|/
* Optimize the three-way merge of git-read-treeLinus Torvalds2007-08-101-2/+5
* Optimize the two-way merge of git-read-tree tooLinus Torvalds2007-08-101-3/+4
* Optimize the common cases of git-read-treeLinus Torvalds2007-08-101-3/+3
* Move old index entry removal from "unpack_trees()" into the individual functionsLinus Torvalds2007-08-101-6/+23
* Start moving unpack-trees to "struct tree_desc"Linus Torvalds2007-08-101-16/+9
* unpack-trees.c: assume submodules are clean during check-outJunio C Hamano2007-08-051-0/+9
* cleanup unpack-trees.c: shrink struct tree_entry_listRené Scharfe2007-07-241-9/+3
* unpack-trees.c: assume submodules are clean during check-outSven Verdoolaege2007-07-181-25/+50
* Teach read-tree 2-way merge to ignore intermediate symlinksJunio C Hamano2007-07-121-0/+3
* Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-201-4/+0
|\
| * unpack-trees.c: verify_uptodate: remove dead codeSven Verdoolaege2007-05-201-4/+0
* | read-tree -m -u: avoid getting confused by intermediate symlinks.Junio C Hamano2007-05-111-4/+10
View Lorry Controller Status