summaryrefslogtreecommitdiff
path: root/builtin-read-tree.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/lockfile' into nextJunio C Hamano2006-06-061-4/+4
|\
| * Make index file locking code reusable to others.Junio C Hamano2006-06-061-4/+4
* | Merge branch 'js/alias' into nextJunio C Hamano2006-06-051-0/+1
|\ \ | |/
| * read-tree: fix eye-candy.Linus Torvalds2006-06-051-0/+1
* | Fix earlier mismerges.Junio C Hamano2006-06-041-4/+2
* | Merge branch 'vb/sendemail' into nextJunio C Hamano2006-06-041-10/+14
|\ \ | |/
| * Merge branch 'lt/tree-2'Junio C Hamano2006-06-031-12/+56
| |\
| * | read-tree --reset: update working tree file for conflicted paths.Junio C Hamano2006-06-031-10/+14
* | | Merge branch 'lt/tree-2' into nextJunio C Hamano2006-05-311-23/+13
|\ \ \ | | |/ | |/|
| * | tree_entry(): new tree-walking helper functionLinus Torvalds2006-05-301-23/+13
* | | Merge branch 'jc/lt-tree-n-cache-tree' into nextJunio C Hamano2006-05-291-8/+48
|\ \ \ | |/ /
| * | Remove last vestiges of generic tree_entry_listLinus Torvalds2006-05-291-1/+44
| * | Remove "tree->entries" tree-entry list from tree parserLinus Torvalds2006-05-291-2/+2
| * | builtin-read-tree.c: avoid tree_entry_list in prime_cache_tree_rec()Linus Torvalds2006-05-291-5/+15
| * | Make "tree_entry" have a SHA1 instead of a union of object pointersLinus Torvalds2006-05-291-4/+5
| * | Make "struct tree" contain the pointer to the tree bufferLinus Torvalds2006-05-291-2/+2
| |/
| * Merge branch 'jc/cache-tree'Junio C Hamano2006-05-281-3/+59
* | Merge branch 'jc/lt-tree-n-cache-tree' into nextJunio C Hamano2006-05-281-12/+26
|\ \
| * | Merge branch 'lt/tree' into jc/lt-tree-n-cache-treeJunio C Hamano2006-05-281-3/+72
| * | Remove "tree->entries" tree-entry list from tree parserLinus Torvalds2006-05-281-2/+2
| * | Make "tree_entry" have a SHA1 instead of a union of object pointersLinus Torvalds2006-05-281-3/+4
| * | Add raw tree buffer info to "struct tree"Linus Torvalds2006-05-281-2/+2
| |/
* | Merge branch 'jc/builtin-n-tar-tree' into nextJunio C Hamano2006-05-231-9/+125
|/
* Builtin git-read-tree.Peter Eriksen2006-05-231-0/+882