Merge branch 'jn/fast-import-blob-access'
commit914584266c7675d3d0fa18e0eed05742327b22e5
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Dec 2010 20:58:38 +0000 (16 12:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Dec 2010 20:58:38 +0000 (16 12:58 -0800)
treeab6a44bcb8fd8263e0fdbebfd4b722de4a070d91
parent4bb4d30095fbc3b1689cc656e71f6a51e43fbd69
parenta3a6f4c4cdc42a4d432bc51915d3e1d092d8ca9a
Merge branch 'jn/fast-import-blob-access'

* jn/fast-import-blob-access:
  t9300: avoid short reads from dd
  t9300: remove unnecessary use of /dev/stdin
  fast-import: Allow cat-blob requests at arbitrary points in stream
  fast-import: let importers retrieve blobs
  fast-import: clarify documentation of "feature" command
  fast-import: stricter parsing of integer options

Conflicts:
fast-import.c
Documentation/git-fast-import.txt
fast-import.c
t/t9300-fast-import.sh