aboutsummaryrefslogtreecommitdiff
path: root/merge.c
Commit message (Expand)AuthorAge
* Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano2017-12-22
|\
| * move index_has_changes() from builtin/am.c to merge.c for reuseElijah Newren2017-12-22
* | read-cache: leave lock in right state in `write_locked_index()`Martin Ågren2017-10-07
* | treewide: prefer lockfiles on the stackMartin Ågren2017-10-06
|/
* tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-08
* merge: convert checkout_fast_forward to struct object_idbrian m. carlson2017-05-08
* lockfile: LOCK_REPORT_ON_ERRORJunio C Hamano2016-12-07
* sequencer: lib'ify checkout_fast_forward()Johannes Schindelin2016-09-09
* Convert struct object to object_idbrian m. carlson2015-11-20
* 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