From: Avery Pennarun Date: Fri, 2 Oct 2009 18:53:35 +0000 (-0400) Subject: Merge branch 'master' of git://github.com/voxpelli/git-subtree X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=39ee6ecf7ed8b3c6a5c8ed24f825211f3b920f76;p=git.git Merge branch 'master' of git://github.com/voxpelli/git-subtree * 'master' of git://github.com/voxpelli/git-subtree: Check that the type of the tree really is a tree and not a commit as it seems to sometimes become when eg. a submodule has existed in the same position previously. --- 39ee6ecf7ed8b3c6a5c8ed24f825211f3b920f76