Merge branch 'js/log-show-children' into next
commitde8f6f2f1f55b55e9c0ad7cba263eed92a49f361
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 22:42:03 +0000 (6 15:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 22:42:03 +0000 (6 15:42 -0700)
tree32429e80da2e5813412c635b199bc91f49bd6494
parent91f035fe991d4138e1914fa75dc45d745cc00825
parent91b849b273a7f3786d8cac569352aaa8bca7b46c
Merge branch 'js/log-show-children' into next

* js/log-show-children:
  log --children
log-tree.c