OSDN Git Service

Merge branch 'mh/fast-import-notes-fix-new' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:05 +0000 (13:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:05 +0000 (13:32 -0800)
"git fast-import" sometimes mishandled while rebalancing notes
tree, which has been fixed.

* mh/fast-import-notes-fix-new:
  fast-import: properly fanout notes when tree is imported

1  2 
fast-import.c

diff --cc fast-import.c
Simple merge