| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jc/lockfile' into next | Junio C Hamano | 2006-06-06 | 1 | -4/+4 |
|\ |
|
| * | Make index file locking code reusable to others. | Junio C Hamano | 2006-06-06 | 1 | -4/+4 |
* | | Merge branch 'js/alias' into next | Junio C Hamano | 2006-06-05 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | read-tree: fix eye-candy. | Linus Torvalds | 2006-06-05 | 1 | -0/+1 |
* | | Fix earlier mismerges. | Junio C Hamano | 2006-06-04 | 1 | -4/+2 |
* | | Merge branch 'vb/sendemail' into next | Junio C Hamano | 2006-06-04 | 1 | -10/+14 |
|\ \
| |/ |
|
| * | Merge branch 'lt/tree-2' | Junio C Hamano | 2006-06-03 | 1 | -12/+56 |
| |\ |
|
| * | | read-tree --reset: update working tree file for conflicted paths. | Junio C Hamano | 2006-06-03 | 1 | -10/+14 |
* | | | Merge branch 'lt/tree-2' into next | Junio C Hamano | 2006-05-31 | 1 | -23/+13 |
|\ \ \
| | |/
| |/| |
|
| * | | tree_entry(): new tree-walking helper function | Linus Torvalds | 2006-05-30 | 1 | -23/+13 |
* | | | Merge branch 'jc/lt-tree-n-cache-tree' into next | Junio C Hamano | 2006-05-29 | 1 | -8/+48 |
|\ \ \
| |/ / |
|
| * | | Remove last vestiges of generic tree_entry_list | Linus Torvalds | 2006-05-29 | 1 | -1/+44 |
| * | | Remove "tree->entries" tree-entry list from tree parser | Linus Torvalds | 2006-05-29 | 1 | -2/+2 |
| * | | builtin-read-tree.c: avoid tree_entry_list in prime_cache_tree_rec() | Linus Torvalds | 2006-05-29 | 1 | -5/+15 |
| * | | Make "tree_entry" have a SHA1 instead of a union of object pointers | Linus Torvalds | 2006-05-29 | 1 | -4/+5 |
| * | | Make "struct tree" contain the pointer to the tree buffer | Linus Torvalds | 2006-05-29 | 1 | -2/+2 |
| |/ |
|
| * | Merge branch 'jc/cache-tree' | Junio C Hamano | 2006-05-28 | 1 | -3/+59 |
* | | Merge branch 'jc/lt-tree-n-cache-tree' into next | Junio C Hamano | 2006-05-28 | 1 | -12/+26 |
|\ \ |
|
| * | | Merge branch 'lt/tree' into jc/lt-tree-n-cache-tree | Junio C Hamano | 2006-05-28 | 1 | -3/+72 |
| * | | Remove "tree->entries" tree-entry list from tree parser | Linus Torvalds | 2006-05-28 | 1 | -2/+2 |
| * | | Make "tree_entry" have a SHA1 instead of a union of object pointers | Linus Torvalds | 2006-05-28 | 1 | -3/+4 |
| * | | Add raw tree buffer info to "struct tree" | Linus Torvalds | 2006-05-28 | 1 | -2/+2 |
| |/ |
|
* | | Merge branch 'jc/builtin-n-tar-tree' into next | Junio C Hamano | 2006-05-23 | 1 | -9/+125 |
|/ |
|
* | Builtin git-read-tree. | Peter Eriksen | 2006-05-23 | 1 | -0/+882 |