summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-11-22 16:28:23 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-22 16:28:23 -0800
commita1b01c45d58bba35ec1c2533dfb8d87cfa08b19e (patch)
tree648414277bdb09c79e05bcf2a938a97225db598a /Documentation/merge-config.txt
parentMerge branch 'tc/format-attribute' (diff)
parentdiffcore-rename: reduce memory footprint by freeing blob data early (diff)
downloadtgif-a1b01c45d58bba35ec1c2533dfb8d87cfa08b19e.tar.xz
Merge branch 'jk/maint-break-rename-reduce-memory'
* jk/maint-break-rename-reduce-memory: diffcore-rename: reduce memory footprint by freeing blob data early diffcore-break: save cnt_data for other phases diffcore-break: free filespec data as we go
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions