summaryrefslogtreecommitdiff
path: root/merge-blobs.c
AgeCommit message (Expand)AuthorFilesLines
2022-02-02ll-merge: make callers responsible for showing warningsLibravatar Elijah Newren1-1/+4
2018-09-21merge-blobs.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-4/+11
2018-09-21ll-merge.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+2
2018-05-16object-store: move object access functions to object-store.hLibravatar Stefan Beller1-0/+1
2018-03-14sha1_file: convert read_sha1_file to struct object_idLibravatar brian m. carlson1-2/+2
2016-02-26Merge branch 'jk/no-diff-emit-common'Libravatar Junio C Hamano1-36/+2
2016-02-22merge-tree: drop generate_common strategyLibravatar Jeff King1-36/+2
2015-11-20Remove get_object_hash.Libravatar brian m. carlson1-2/+2
2015-11-20Add several uses of get_object_hash.Libravatar brian m. carlson1-2/+2
2015-03-23merge-blobs.c: fix a memleakLibravatar Stefan Beller1-1/+3
2012-12-09Which merge_file() function do you mean?Libravatar Junio C Hamano1-0/+124