summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-26 23:05:38 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-26 23:05:38 -0800
commit31e3d834b39b773831c3c3e2637f2d99bfad9cbf (patch)
treed7367ae2ee53e3717a37e1bbe5eb9e264994fa75 /Documentation/merge-config.txt
parentMerge branch 'jb/filter-ignore-sigpipe' (diff)
parentdo not stream large files to pack when filters are in use (diff)
downloadtgif-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 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions