From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Nov 2010 01:52:32 +0000 (-0800)
Subject: Merge branch 'jn/fast-import-fix'
X-Git-Tag: v1.7.4-rc0~110
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ed8298dc34234a55fc0e90e5ae284ae5f572a436;p=git.git

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

ed8298dc34234a55fc0e90e5ae284ae5f572a436