summaryrefslogtreecommitdiff
path: root/unpack-trees.c
AgeCommit message (Expand)AuthorFilesLines
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
2007-05-20unpack-trees.c: verify_uptodate: remove dead codeLibravatar Sven Verdoolaege1-4/+0
2007-05-11read-tree -m -u: avoid getting confused by intermediate symlinks.Libravatar Junio C Hamano1-4/+10
2007-04-22delay progress display when checking out filesLibravatar Nicolas Pitre1-7/+2
2007-04-22make progress "title" part of the common progress interfaceLibravatar Nicolas Pitre1-4/+3
2007-04-22common progress display supportLibravatar Nicolas Pitre1-45/+9
2007-04-10Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()Libravatar Junio C Hamano1-14/+20
2007-04-10t1000: fix case table.Libravatar Junio C Hamano1-1/+1
2007-04-04Fix switching to a branch with D/F when current branch has file D.Libravatar Junio C Hamano1-1/+112
2007-04-04Fix twoway_merge that passed d/f conflict marker to merged_entry().Libravatar Junio C Hamano1-2/+8
2007-04-04unpack-trees: get rid of *indpos parameter.Libravatar Junio C Hamano1-9/+7
2007-04-04unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.Libravatar Junio C Hamano1-7/+7
2007-03-21Initialize tree descriptors with a helper function rather than by hand.Libravatar Linus Torvalds1-2/+1
2006-12-20simplify inclusion of system header files.Libravatar Junio C Hamano1-2/+0
2006-12-13Merge branch 'jc/read-tree-ignore'Libravatar Junio C Hamano1-5/+19
2006-12-05read-tree: further loosen "working file will be lost" check.Libravatar Junio C Hamano1-5/+19
2006-12-04unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.Libravatar Junio C Hamano1-3/+5
2006-10-27merge: loosen overcautious "working file will be lost" check.Libravatar Junio C Hamano1-3/+1
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Libravatar Shawn Pearce1-1/+1
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.Libravatar David Rientjes1-1/+1
2006-08-15remove unnecessary initializationsLibravatar David Rientjes1-1/+1
2006-08-15use appropriate typedefsLibravatar David Rientjes1-1/+1
2006-07-30read-tree: move merge functions to the libraryLibravatar Johannes Schindelin1-0/+404
2006-07-30read-trees: refactor the unpack_trees() partLibravatar Johannes Schindelin1-0/+395
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 10:50:58 +0000