| commit | 25e014c65e21e2995dabd964d65fc1f032b5ee2c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Feb 2012 01:48:11 +0000 (26 17:48 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Feb 2012 01:48:11 +0000 (26 17:48 -0800) | ||
| tree | 9466a17f805c6b04b35019e6c9fe357ca8ad8be3 | treesnapshot (tar.gz zip) |
| parent | 1363bd66e35f2dcc03798d73a38785ca8ed2efaf | commitdiff |
| parent | 4f22b1015d4203ccdf2b66f27ee5946504342ace | commitdiff |
Merge branch 'jk/maint-avoid-streaming-filtered-contents' into next
* jk/maint-avoid-streaming-filtered-contents:
do not stream large files to pack when filters are in use
teach dry-run convert_to_git not to require a src buffer
teach convert_to_git a "dry run" mode
Conflicts:
convert.c
* jk/maint-avoid-streaming-filtered-contents:
do not stream large files to pack when filters are in use
teach dry-run convert_to_git not to require a src buffer
teach convert_to_git a "dry run" mode
Conflicts:
convert.c
| convert.c | diff1 | diff2 | blobhistory |
| sha1_file.c | diff1 | diff2 | blobhistory |