![[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) | ||
| commit | 39ee6ecf7ed8b3c6a5c8ed24f825211f3b920f76 | |
| tree | 369a4e5598d8909038018523574ccd6f42dded46 | tree | snapshot |
| parent | add00a3229ba4ada0cb47a447fdc483658df78e9 | commit | diff |
| parent | 8ac5eca1eaa88bd5b998e91531937404bc6425c4 | commit | diff |
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.
* '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.