Merge branch 'jn/fast-import-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:32 +0000 (17:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:32 +0000 (17:52 -0800)
commited8298dc34234a55fc0e90e5ae284ae5f572a436
tree9b6427f9276e4a1e93e2f5b6ab59317701019f52
parente4663556cfa0d85e7a80d731b07d4058335761ff
parentb21241253bf1216bd31d24d27446895ea17b1a08
Merge branch 'jn/fast-import-fix'

* jn/fast-import-fix:
  fast-import: do not clear notes in do_change_note_fanout()
  t9300 (fast-import): another test for the "replace root" feature
  fast-import: tighten M 040000 syntax
  fast-import: filemodify after M 040000 <tree> "" crashes
fast-import.c
t/t9300-fast-import.sh