![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 Dec 2010 20:58:38 +0000 (12:58 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 Dec 2010 20:58:38 +0000 (12:58 -0800) | ||
| commit | 914584266c7675d3d0fa18e0eed05742327b22e5 | |
| tree | ab6a44bcb8fd8263e0fdbebfd4b722de4a070d91 | tree | snapshot |
| parent | 4bb4d30095fbc3b1689cc656e71f6a51e43fbd69 | commit | diff |
| parent | a3a6f4c4cdc42a4d432bc51915d3e1d092d8ca9a | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |
| fast-import.c | diff1 | | diff2 | | blob | history |
| t/t9300-fast-import.sh | diff1 | | diff2 | | blob | history |