From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Nov 2010 22:39:30 +0000 (-0800)
Subject: Merge branch 'jn/fast-import-fix' into next
X-Git-Tag: ko-next~140
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ef3b791ef177689518a21c1be8af33a547b1faa5;p=git.git

Merge branch 'jn/fast-import-fix' into next

* 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
---

ef3b791ef177689518a21c1be8af33a547b1faa5