projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit39ee6ecf7ed8b3c6a5c8ed24f825211f3b920f76
tree369a4e5598d8909038018523574ccd6f42dded46tree | snapshot
parentadd00a3229ba4ada0cb47a447fdc483658df78e9commit | diff
parent8ac5eca1eaa88bd5b998e91531937404bc6425c4commit | 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.
Git—the stupid content tracker