summaryrefslogtreecommitdiff
path: root/unpack-trees.c
AgeCommit message (Expand)Author
2008-09-10checkout: do not lose staged removalJunio C Hamano
2008-08-24unpack_trees(): protect the handcrafted in-core index from read_cache()Junio C Hamano
2008-05-30unpack_trees(): allow callers to differentiate worktree errors from merge errorsJunio C Hamano
2008-05-20unpack-trees: allow Porcelain to give different error messagesJunio C Hamano
2008-05-11Optimize symlink/directory detectionLinus Torvalds
2008-04-09Make unpack-tree update removed files before any updated filesLinus Torvalds
2008-04-09Make branch merging aware of underlying case-insensitive filsystemsLinus Torvalds
2008-04-09Make hash_name_lookup able to do case-independent lookupsLinus Torvalds
2008-04-09Make "index_name_exists()" return the cache_entry it foundLinus Torvalds
2008-03-19Fix read-tree not to discard errorsJunio C Hamano
2008-03-16Don't update unchanged merge entriesLinus Torvalds
2008-03-15Fix recent 'unpack_trees()'-related changes breaking 'git stash'Linus Torvalds
2008-03-14read-tree() and unpack_trees(): use consistent limitJunio C Hamano
2008-03-11unpack_trees(): fix diff-index regression.Linus Torvalds
2008-03-10traverse_trees_recursive(): propagate merge errors upJunio C Hamano
2008-03-09unpack_trees(): minor memory leak fix in unused destination indexLinus Torvalds
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds
2008-03-09Move 'unpack_trees()' over to 'traverse_trees()' interfaceLinus Torvalds
2008-02-27Merge branch 'db/checkout'Junio C Hamano
2008-02-24Be more verbose when checkout takes a long timeLinus Torvalds
2008-02-23Use helper function for copying index entry informationLinus Torvalds
2008-02-17Merge branch 'jc/gitignore-ends-with-slash'Junio C Hamano
2008-02-10Add "skip_unmerged" option to unpack_trees.Daniel Barkalow
2008-02-10Discard "deleted" cache entries after using them to update the working treeDaniel Barkalow
2008-02-10Send unpack-trees debugging output to stderrDaniel Barkalow
2008-02-10Add flag to make unpack_trees() not print errors.Daniel Barkalow
2008-02-10Allow callers of unpack_trees() to handle failureDaniel Barkalow
2008-02-05gitignore: lazily find dtypeJunio C Hamano
2008-02-05gitignore(5): Allow "foo/" in ignore list to match directory "foo"Junio C Hamano
2008-01-21Make on-disk index representation separate from in-core oneLinus Torvalds
2007-12-18unpack-trees: FLEX_ARRAY fixLinus Torvalds
2007-11-29per-directory-exclude: lazily read .gitignore filesJunio C Hamano
2007-11-14Merge branch 'jc/maint-add-sync-stat'Junio C Hamano
2007-11-10ce_match_stat, run_diff_files: use symbolic constants for readabilityJunio C Hamano
2007-10-30relax usage of the progress APINicolas Pitre
2007-10-30make struct progress an opaque typeNicolas Pitre
2007-10-17more compact progress displayNicolas Pitre
2007-08-11Optimize the three-way merge of git-read-treeLinus Torvalds
2007-08-10Optimize the two-way merge of git-read-tree tooLinus Torvalds
2007-08-10Optimize the common cases of git-read-treeLinus Torvalds
2007-08-10Move old index entry removal from "unpack_trees()" into the individual functionsLinus Torvalds
2007-08-10Start moving unpack-trees to "struct tree_desc"Linus Torvalds
2007-08-05unpack-trees.c: assume submodules are clean during check-outJunio C Hamano
2007-07-25cleanup unpack-trees.c: shrink struct tree_entry_listRené Scharfe
2007-07-19unpack-trees.c: assume submodules are clean during check-outSven Verdoolaege
2007-07-12Teach read-tree 2-way merge to ignore intermediate symlinksJunio C Hamano
2007-05-21Merge branch 'maint-1.5.1' into maintJunio C Hamano
2007-05-20unpack-trees.c: verify_uptodate: remove dead codeSven Verdoolaege
2007-05-12read-tree -m -u: avoid getting confused by intermediate symlinks.Junio C Hamano
generated by cgit v0.10.2-6-g49f6 at 2024-04-16 03:59:24 (GMT)