summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-30 05:13:09 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-30 05:13:09 (GMT)
commit47df096f254ccac5a81da615b3fd25f3cf466bbf (patch)
treed490a2039f8e8ab384f84d2c987341fbb2f17762
parent15b5536ee47c6684806edd7725adbbdede9fb95c (diff)
parente76abd701419b50937708cfec2f772d33057505e (diff)
downloadgit-47df096f254ccac5a81da615b3fd25f3cf466bbf.zip
git-47df096f254ccac5a81da615b3fd25f3cf466bbf.tar.gz
git-47df096f254ccac5a81da615b3fd25f3cf466bbf.tar.bz2
Merge branch 'jc/lt-tree-n-cache-tree' into lt/tree-2
* jc/lt-tree-n-cache-tree: adjust to the rebased series by Linus. Remove "tree->entries" tree-entry list from tree parser Switch "read_tree_recursive()" over to tree-walk functionality Make "tree_entry" have a SHA1 instead of a union of object pointers Add raw tree buffer info to "struct tree" This results as if an "ours" merge absorbed the previous "next" branch change into the 10-patch series, but it really is a result of an honest merge. nothing to commit
0 files changed, 0 insertions, 0 deletions