projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: add00a3 8ac5eca)
Merge branch 'master' of git://github.com/voxpelli/git-subtree
authorAvery Pennarun <apenwarr@gmail.com>
Fri, 2 Oct 2009 18:53:35 +0000 (14:53 -0400)
committerAvery 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.


Trivial merge
Git—the stupid content tracker