![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Avery Pennarun <apenwarr@gmail.com> | |
| Fri, 2 Oct 2009 18:53:35 +0000 (14:53 -0400) | ||
| committer | Avery Pennarun <apenwarr@gmail.com> | |
| Fri, 2 Oct 2009 18:53:35 +0000 (14:53 -0400) |
* '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.
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.
Trivial merge