summaryrefslogtreecommitdiff
path: root/unpack-trees.c
AgeCommit message (Expand)AuthorFilesLines
2008-11-11Fix non-literal format in printf-style callsLibravatar Daniel Lowe1-1/+1
2008-11-01correct cache_entry allocationLibravatar Jeff King1-1/+1
2008-09-09checkout: do not lose staged removalLibravatar Junio C Hamano1-1/+10
2008-08-23unpack_trees(): protect the handcrafted in-core index from read_cache()Libravatar Junio C Hamano1-0/+1
2008-05-29unpack_trees(): allow callers to differentiate worktree errors from merge errorsLibravatar Junio C Hamano1-3/+7
2008-05-19unpack-trees: allow Porcelain to give different error messagesLibravatar Junio C Hamano1-14/+41
2008-05-10Optimize symlink/directory detectionLibravatar Linus Torvalds1-7/+5
2008-04-09Make unpack-tree update removed files before any updated filesLibravatar Linus Torvalds1-2/+7
2008-04-09Make branch merging aware of underlying case-insensitive filsystemsLibravatar Linus Torvalds1-0/+26
2008-04-09Make hash_name_lookup able to do case-independent lookupsLibravatar Linus Torvalds1-1/+1
2008-04-09Make "index_name_exists()" return the cache_entry it foundLibravatar Linus Torvalds1-4/+4
2008-03-18Fix read-tree not to discard errorsLibravatar Junio C Hamano1-3/+6
2008-03-16Don't update unchanged merge entriesLibravatar Linus Torvalds1-3/+6
2008-03-14Fix recent 'unpack_trees()'-related changes breaking 'git stash'Libravatar Linus Torvalds1-0/+2
2008-03-13read-tree() and unpack_trees(): use consistent limitLibravatar Junio C Hamano1-3/+3
2008-03-10unpack_trees(): fix diff-index regression.Libravatar Linus Torvalds1-2/+0
2008-03-10traverse_trees_recursive(): propagate merge errors upLibravatar Junio C Hamano1-3/+4
2008-03-09unpack_trees(): minor memory leak fix in unused destination indexLibravatar Linus Torvalds1-0/+1
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLibravatar Linus Torvalds1-77/+72
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLibravatar Linus Torvalds1-39/+40
2008-03-09Move 'unpack_trees()' over to 'traverse_trees()' interfaceLibravatar Linus Torvalds1-281/+249
2008-02-27Merge branch 'db/checkout'Libravatar Junio C Hamano1-56/+98
2008-02-24Be more verbose when checkout takes a long timeLibravatar Linus Torvalds1-1/+1
2008-02-22Use helper function for copying index entry informationLibravatar Linus Torvalds1-1/+1
2008-02-16Merge branch 'jc/gitignore-ends-with-slash'Libravatar Junio C Hamano1-1/+2
2008-02-09Add "skip_unmerged" option to unpack_trees.Libravatar Daniel Barkalow1-3/+17
2008-02-09Discard "deleted" cache entries after using them to update the working treeLibravatar Daniel Barkalow1-7/+9
2008-02-09Send unpack-trees debugging output to stderrLibravatar Daniel Barkalow1-7/+7
2008-02-09Add flag to make unpack_trees() not print errors.Libravatar Daniel Barkalow1-14/+29
2008-02-09Allow callers of unpack_trees() to handle failureLibravatar Daniel Barkalow1-37/+48
2008-02-05gitignore: lazily find dtypeLibravatar Junio C Hamano1-1/+2
2008-02-05gitignore(5): Allow "foo/" in ignore list to match directory "foo"Libravatar Junio C Hamano1-1/+1
2008-01-21Make on-disk index representation separate from in-core oneLibravatar Linus Torvalds1-15/+14
2007-12-18unpack-trees: FLEX_ARRAY fixLibravatar Linus Torvalds1-1/+1
2007-11-29per-directory-exclude: lazily read .gitignore filesLibravatar Junio C Hamano1-6/+0
2007-11-14Merge branch 'jc/maint-add-sync-stat'Libravatar Junio C Hamano1-2/+2
2007-11-10ce_match_stat, run_diff_files: use symbolic constants for readabilityLibravatar Junio C Hamano1-2/+2
2007-10-30relax usage of the progress APILibravatar Nicolas Pitre1-5/+3
2007-10-30make struct progress an opaque typeLibravatar Nicolas Pitre1-5/+5
2007-10-17more compact progress displayLibravatar Nicolas Pitre1-2/+2
2007-08-10Optimize the three-way merge of git-read-treeLibravatar Linus Torvalds1-2/+5
2007-08-10Optimize the two-way merge of git-read-tree tooLibravatar Linus Torvalds1-3/+4
2007-08-10Optimize the common cases of git-read-treeLibravatar Linus Torvalds1-3/+3
2007-08-10Move old index entry removal from "unpack_trees()" into the individual functionsLibravatar Linus Torvalds1-6/+23
2007-08-10Start moving unpack-trees to "struct tree_desc"Libravatar Linus Torvalds1-16/+9
2007-08-05unpack-trees.c: assume submodules are clean during check-outLibravatar Junio C Hamano1-0/+9
2007-07-24cleanup unpack-trees.c: shrink struct tree_entry_listLibravatar René Scharfe1-9/+3
2007-07-18unpack-trees.c: assume submodules are clean during check-outLibravatar Sven Verdoolaege1-25/+50
2007-07-12Teach read-tree 2-way merge to ignore intermediate symlinksLibravatar Junio C Hamano1-0/+3
2007-05-20Merge branch 'maint-1.5.1' into maintLibravatar Junio C Hamano1-4/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 15:20:50 +0000