![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 30 Nov 2010 01:52:32 +0000 (17:52 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 30 Nov 2010 01:52:32 +0000 (17:52 -0800) | ||
| commit | ed8298dc34234a55fc0e90e5ae284ae5f572a436 | |
| tree | 9b6427f9276e4a1e93e2f5b6ab59317701019f52 | tree | snapshot |
| parent | e4663556cfa0d85e7a80d731b07d4058335761ff | commit | diff |
| parent | b21241253bf1216bd31d24d27446895ea17b1a08 | commit | diff |
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
* 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 |