diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-26 23:05:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-26 23:05:38 -0800 |
| commit | 31e3d834b39b773831c3c3e2637f2d99bfad9cbf (patch) | |
| tree | d7367ae2ee53e3717a37e1bbe5eb9e264994fa75 /builtin/merge-recursive.c | |
| parent | Merge branch 'jb/filter-ignore-sigpipe' (diff) | |
| parent | do not stream large files to pack when filters are in use (diff) | |
| download | tgif-31e3d834b39b773831c3c3e2637f2d99bfad9cbf.tar.xz | |
Merge branch 'jk/maint-avoid-streaming-filtered-contents'
* 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 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions