summaryrefslogtreecommitdiff
path: root/merge.c
Commit message (Expand)AuthorAgeFilesLines
* tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-081-2/+2
* merge: convert checkout_fast_forward to struct object_idbrian m. carlson2017-05-081-4/+4
* lockfile: LOCK_REPORT_ON_ERRORJunio C Hamano2016-12-071-1/+1
* sequencer: lib'ify checkout_fast_forward()Johannes Schindelin2016-09-091-3/+6
* Convert struct object to object_idbrian m. carlson2015-11-201-1/+1
* lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-011-0/+1
* Merge branch 'nd/split-index'Junio C Hamano2014-07-161-4/+3
|\
| * read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-131-4/+3
* | merge: use argv_array when spawning merge strategyJeff King2014-06-191-29/+13
|/
* Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy2012-10-291-0/+112