diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-03-04 22:16:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-04 22:16:40 -0800 |
| commit | a09a0c27094f15774e513286c02adacc11b6e6b2 (patch) | |
| tree | d0368dde01b2e8820f169b9264573f479f892679 /xdiff/xmerge.c | |
| parent | Merge branch 'jb/filter-ignore-sigpipe' into maint (diff) | |
| parent | do not stream large files to pack when filters are in use (diff) | |
| download | tgif-a09a0c27094f15774e513286c02adacc11b6e6b2.tar.xz | |
Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maint
* 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
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions