Merge branch 'di/fast-import-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2011 23:00:32 +0000 (16:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2011 23:00:32 +0000 (16:00 -0700)
commit1d21112a946b338feaa4df4183ea26ac5d1353d0
tree5038b2bbaba3c88dcddd7a5e0460cbc9b873d136
parent7abd8fb36d90cc68d471a04b59846d7816609116
parent3beb4fc461e72f0b93ae233dcc1cece0046b8eb8
Merge branch 'di/fast-import-doc'

* di/fast-import-doc:
  doc/fast-import: document feature import-marks-if-exists
Documentation/git-fast-import.txt
t/t9300-fast-import.sh