author | Junio C Hamano <gitster@pobox.com> | |
Mon, 27 Feb 2012 07:05:38 +0000 (23:05 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 27 Feb 2012 07:05:38 +0000 (23:05 -0800) |
* 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
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
1 | 2 | |||
---|---|---|---|---|
convert.c | patch | | diff1 | | diff2 | | blob | history |
sha1_file.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc convert.c
Simple merge
diff --cc sha1_file.c
Simple merge