path: root/unpack-trees.c
AgeCommit message (Expand)Author
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
2007-04-23delay progress display when checking out filesNicolas Pitre
2007-04-23make progress "title" part of the common progress interfaceNicolas Pitre
2007-04-23common progress display supportNicolas Pitre
2007-04-10Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()Junio C Hamano
2007-04-10t1000: fix case table.Junio C Hamano
2007-04-04Fix switching to a branch with D/F when current branch has file D.Junio C Hamano
2007-04-04Fix twoway_merge that passed d/f conflict marker to merged_entry().Junio C Hamano
2007-04-04unpack-trees: get rid of *indpos parameter.Junio C Hamano
2007-04-04unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.Junio C Hamano
2007-03-21Initialize tree descriptors with a helper function rather than by hand.Linus Torvalds
2006-12-20simplify inclusion of system header files.Junio C Hamano
2006-12-13Merge branch 'jc/read-tree-ignore'Junio C Hamano
2006-12-06read-tree: further loosen "working file will be lost" check.Junio C Hamano
2006-12-04unpack-trees: make sure "" is NUL terminated.Junio C Hamano
2006-10-28merge: loosen overcautious "working file will be lost" check.Junio C Hamano
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes
2006-08-16remove unnecessary initializationsDavid Rientjes
2006-08-15use appropriate typedefsDavid Rientjes
2006-07-31read-tree: move merge functions to the libraryJohannes Schindelin
2006-07-31read-trees: refactor the unpack_trees() partJohannes Schindelin