| commit | a42f0b3dea41edc239ceb12e79de2d49950f132a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Dec 2010 20:25:29 +0000 (8 12:25 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Dec 2010 20:25:29 +0000 (8 12:25 -0800) | ||
| tree | aeb7ea30416e3e3a8c1d0fb02c788ebf3b3d92df | treesnapshot (tar.gz zip) |
| parent | 44be9e5475bd6d51424968e7c6251847a1ff15e0 | commitdiff |
| parent | 491e359c949ef7b7ed3fd24ba59f1b7e4cc17e87 | commitdiff |
Merge branch 'jn/fast-import-blob-access' into next
* jn/fast-import-blob-access:
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: 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 | blobhistory |
| fast-import.c | diff1 | diff2 | blobhistory |
| t/t9300-fast-import.sh | diff1 | diff2 | blobhistory |