aboutsummaryrefslogtreecommitdiff
path: root/merge.c
Commit message (Expand)AuthorAge
* lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty2014-10-01
* Merge branch 'nd/split-index'Junio C Hamano2014-07-16
|\
| * read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-13
* | merge: use argv_array when spawning merge strategyJeff King2014-06-19
|/
* Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy2012-10-29