summaryrefslogtreecommitdiff
path: root/merge.c
AgeCommit message (Expand)Author
2015-11-20Convert struct object to object_idbrian m. carlson
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty
2014-07-16Merge branch 'nd/split-index'Junio C Hamano
2014-06-19merge: use argv_array when spawning merge strategyJeff King
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy
2012-10-29Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy