summaryrefslogtreecommitdiff
path: root/merge.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ma/unpack-trees-free-msgs'Junio C Hamano2018-05-301-15/+20
|\
| * unpack_trees_options: free messages when doneMartin Ågren2018-05-221-0/+3
| * merge: setup `opts` later in `checkout_fast_forward()`Martin Ågren2018-05-211-15/+17
* | merge: convert empty tree constant to the_hash_algobrian m. carlson2018-05-021-4/+1
|/
* merge: always roll back lock in `checkout_fast_forward()`Martin Ågren2018-02-281-3/+9
* Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano2017-12-221-0/+33
|\
| * move index_has_changes() from builtin/am.c to merge.c for reuseElijah Newren2017-12-221-0/+33
* | read-cache: leave lock in right state in `write_locked_index()`Martin Ågren2017-10-071-3/+1
* | treewide: prefer lockfiles on the stackMartin Ågren2017-10-061-4/+4
|/
* 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
View Lorry Controller Status