summaryrefslogtreecommitdiff
path: root/merge.c
AgeCommit message (Expand)AuthorFilesLines
2018-05-30Merge branch 'ma/unpack-trees-free-msgs'Libravatar Junio C Hamano1-15/+20
2018-05-22unpack_trees_options: free messages when doneLibravatar Martin Ågren1-0/+3
2018-05-21merge: setup `opts` later in `checkout_fast_forward()`Libravatar Martin Ågren1-15/+17
2018-05-02merge: convert empty tree constant to the_hash_algoLibravatar brian m. carlson1-4/+1
2018-02-28merge: always roll back lock in `checkout_fast_forward()`Libravatar Martin Ågren1-3/+9
2017-12-22Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Libravatar Junio C Hamano1-0/+33
2017-12-22move index_has_changes() from builtin/am.c to merge.c for reuseLibravatar Elijah Newren1-0/+33
2017-10-07read-cache: leave lock in right state in `write_locked_index()`Libravatar Martin Ågren1-3/+1
2017-10-06treewide: prefer lockfiles on the stackLibravatar Martin Ågren1-4/+4
2017-05-08tree: convert parse_tree_indirect to struct object_idLibravatar brian m. carlson1-2/+2
2017-05-08merge: convert checkout_fast_forward to struct object_idLibravatar brian m. carlson1-4/+4
2016-12-07lockfile: LOCK_REPORT_ON_ERRORLibravatar Junio C Hamano1-1/+1
2016-09-09sequencer: lib'ify checkout_fast_forward()Libravatar Johannes Schindelin1-3/+6
2015-11-20Convert struct object to object_idLibravatar brian m. carlson1-1/+1
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cLibravatar Michael Haggerty1-0/+1
2014-07-16Merge branch 'nd/split-index'Libravatar Junio C Hamano1-4/+3
2014-06-19merge: use argv_array when spawning merge strategyLibravatar Jeff King1-29/+13
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