Merge branch 'jk/empty-tree'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Feb 2008 00:13:28 +0000 (16:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Feb 2008 00:13:28 +0000 (16:13 -0800)
* jk/empty-tree:
  add--interactive: handle initial commit better
  hard-code the empty tree object

1  2 
sha1_file.c

diff --cc sha1_file.c
Simple merge