summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-03-04 22:26:17 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-04 22:26:17 -0800
commit780fc9a0a6d13f667bb012621692107d244998a8 (patch)
tree7b7aed7be1531cbee13b914070694575fabee5f4 /Documentation/git-merge-tree.txt
parentMerge branch 'np/compress-loose-object-memsave' into maint (diff)
parenthash-object: don't use mmap() for small files (diff)
downloadtgif-780fc9a0a6d13f667bb012621692107d244998a8.tar.xz
Merge branch 'dp/read-not-mmap-small-loose-object' into maint
* dp/read-not-mmap-small-loose-object: hash-object: don't use mmap() for small files
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions