diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-16 12:58:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-16 12:58:38 -0800 |
| commit | 914584266c7675d3d0fa18e0eed05742327b22e5 (patch) | |
| tree | ab6a44bcb8fd8263e0fdbebfd4b722de4a070d91 /t/t6020-merge-df.sh | |
| parent | Merge branch 'jl/fetch-submodule-recursive' (diff) | |
| parent | t9300: avoid short reads from dd (diff) | |
| download | tgif-914584266c7675d3d0fa18e0eed05742327b22e5.tar.xz | |
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
Diffstat (limited to 't/t6020-merge-df.sh')
0 files changed, 0 insertions, 0 deletions