projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6fd6a2f b212412)
Merge branch 'jn/fast-import-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 22:39:30 +0000 (14:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 22:39:30 +0000 (14:39 -0800)
commitef3b791ef177689518a21c1be8af33a547b1faa5
tree753aeb39bb26bde89b5dbbbdedeb966663d89810tree | snapshot
parent6fd6a2f109fa321f1f872fde2ae25c53931a9539commit | diff
parentb21241253bf1216bd31d24d27446895ea17b1a08commit | diff
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
fast-import.c diff1 | diff2 | blob | history
t/t9300-fast-import.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.