Andrew's git / gitweb.git / diff
?
Merge branch 'jn/fast-import-empty-tree-removal' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jan 2011 18:23:53 +0000 (10:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jan 2011 18:23:53 +0000 (10:23 -0800)
* jn/fast-import-empty-tree-removal:
fast-import: treat filemodify with empty tree as delete

1  2 
fast-import.c patch | diff1 | diff2 | blob | history
t/t9300-fast-import.sh patch | diff1 | diff2 | blob | history
diff --cc fast-import.c
Simple merge
diff --cc t/t9300-fast-import.sh
Simple merge