git.verplant.org Git - git.git/commit

projects / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a4b7dbe b5039db)

author	Linus Torvalds <torvalds@ppc970.osdl.org>
	Mon, 18 Apr 2005 19:12:00 +0000 (12:12 -0700)
committer	Linus Torvalds <torvalds@ppc970.osdl.org>
	Mon, 18 Apr 2005 19:12:00 +0000 (12:12 -0700)
commit	b51ad4314078298194d23d46e2b4473ffd32a88a
tree	3dfffcf747e4fbdb04f1b43251be932f69f55476	tree \| snapshot
parent	a4b7dbef4ef53f4fffbda0a6f5eada4c377e3fc5	commit \| diff
parent	b5039db6d25ae25f1cb2db541ed13602784fafc3	commit \| diff

Merge the new object model thing from Daniel Barkalow

This was a real git merge with conflicts. I'll commit the scripts I used
to do the merge next.

Not pretty, but it's half-way functional.

Makefile	diff1 \|	diff2 \|	blob \| history
fsck-cache.c	diff1 \|	diff2 \|	blob \| history
merge-base.c	diff1 \|	diff2 \|	blob \| history

The core git plumbing