Merge branch 'di/fast-import-ident'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:18:47 +0000 (21:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:18:47 +0000 (21:18 -0700)
* di/fast-import-ident:
  fsck: improve committer/author check
  fsck: add a few committer name tests
  fast-import: check committer name more strictly
  fast-import: don't fail on omitted committer name
  fast-import: add input format tests

1  2 
Documentation/git-fast-import.txt
fast-import.c
t/t9300-fast-import.sh

Simple merge
diff --cc fast-import.c
Simple merge
Simple merge