summaryrefslogtreecommitdiff
path: root/merge-blobs.c
Commit message (Expand)AuthorAgeFilesLines
* merge-blobs.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-4/+11
* ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+2
* object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-2/+2
* Merge branch 'jk/no-diff-emit-common'Junio C Hamano2016-02-261-36/+2
|\
| * merge-tree: drop generate_common strategyJeff King2016-02-221-36/+2
* | Remove get_object_hash.brian m. carlson2015-11-201-2/+2
* | Add several uses of get_object_hash.brian m. carlson2015-11-201-2/+2
|/
* merge-blobs.c: fix a memleakStefan Beller2015-03-231-1/+3
* Which merge_file() function do you mean?Junio C Hamano2012-12-091-0/+124