aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAge
* Fix switching to a branch with D/F when current branch has file D.Junio C Hamano2007-04-04
* Fix twoway_merge that passed d/f conflict marker to merged_entry().Junio C Hamano2007-04-04
* unpack-trees: get rid of *indpos parameter.Junio C Hamano2007-04-04
* unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.Junio C Hamano2007-04-04
* Initialize tree descriptors with a helper function rather than by hand.Linus Torvalds2007-03-21
* simplify inclusion of system header files.Junio C Hamano2006-12-20
* Merge branch 'jc/read-tree-ignore'Junio C Hamano2006-12-13
|\
| * read-tree: further loosen "working file will be lost" check.Junio C Hamano2006-12-05
* | unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.Junio C Hamano2006-12-04
|/
* merge: loosen overcautious "working file will be lost" check.Junio C Hamano2006-10-27
* Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-23
* Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes2006-08-17
* remove unnecessary initializationsDavid Rientjes2006-08-15
* use appropriate typedefsDavid Rientjes2006-08-15
* read-tree: move merge functions to the libraryJohannes Schindelin2006-07-30
* read-trees: refactor the unpack_trees() partJohannes Schindelin2006-07-30
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 11:59:23 +0000