summaryrefslogtreecommitdiff
path: root/merge-blobs.c
AgeCommit message (Expand)Author
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren
2023-06-21merge-ll: rename from ll-mergeElijah Newren
2023-04-06Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano
2023-03-28cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-02-24object-store.h: move struct object_info from cache.hElijah Newren
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren
2018-09-21merge-blobs.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-05-16object-store: move object access functions to object-store.hStefan Beller
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson
2016-02-26Merge branch 'jk/no-diff-emit-common'Junio C Hamano
2016-02-23merge-tree: drop generate_common strategyJeff King
2015-11-20Remove get_object_hash.brian m. carlson
2015-11-20Add several uses of get_object_hash.brian m. carlson
2015-03-23merge-blobs.c: fix a memleakStefan Beller
2012-12-10Which merge_file() function do you mean?Junio C Hamano