summaryrefslogtreecommitdiff
path: root/merge.c
AgeCommit message (Expand)AuthorFilesLines
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheLibravatar Nguyễn Thái Ngọc Duy1-4/+3
2012-10-29Move try_merge_command and checkout_fast_forward to libgit.aLibravatar Nguyễn Thái Ngọc Duy1-0/+112