summaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | delay progress display when checking out filesNicolas Pitre2007-04-221-7/+2
* | make progress "title" part of the common progress interfaceNicolas Pitre2007-04-221-4/+3
* | common progress display supportNicolas Pitre2007-04-221-45/+9
* | Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()Junio C Hamano2007-04-101-14/+20
* | t1000: fix case table.Junio C Hamano2007-04-101-1/+1
* | Fix switching to a branch with D/F when current branch has file D.Junio C Hamano2007-04-041-1/+112
* | Fix twoway_merge that passed d/f conflict marker to merged_entry().Junio C Hamano2007-04-041-2/+8
* | unpack-trees: get rid of *indpos parameter.Junio C Hamano2007-04-041-9/+7
* | unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.Junio C Hamano2007-04-041-7/+7
|/
* Initialize tree descriptors with a helper function rather than by hand.Linus Torvalds2007-03-211-2/+1
* simplify inclusion of system header files.Junio C Hamano2006-12-201-2/+0
* Merge branch 'jc/read-tree-ignore'Junio C Hamano2006-12-131-5/+19
|\
| * read-tree: further loosen "working file will be lost" check.Junio C Hamano2006-12-051-5/+19
* | unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.Junio C Hamano2006-12-041-3/+5
|/
* merge: loosen overcautious "working file will be lost" check.Junio C Hamano2006-10-271-3/+1
* Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-231-1/+1
* Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes2006-08-171-1/+1
* remove unnecessary initializationsDavid Rientjes2006-08-151-1/+1
* use appropriate typedefsDavid Rientjes2006-08-151-1/+1
* read-tree: move merge functions to the libraryJohannes Schindelin2006-07-301-0/+404
* read-trees: refactor the unpack_trees() partJohannes Schindelin2006-07-301-0/+395
View Lorry Controller Status