path: root/merge.c
AgeCommit message (Expand)Author
2022-10-30use child_process members "args" and "env" directlyRené Scharfe
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren
2021-07-01dir.[ch]: replace dir_init() with DIR_INITÆvar Arnfjörð Bjarmason
2020-08-19dir: fix problematic API to avoid memory leaksElijah Newren
2020-07-31strvec: rename struct fieldsJeff King
2020-07-28strvec: convert remaining callers away from argv_array nameJeff King
2020-03-16builtin/checkout: compute checkout metadata for checkoutsbrian m. carlson
2019-01-14read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy
2019-01-14repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy
2018-09-21merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-08-02Merge branch 'en/dirty-merge-fixes'Junio C Hamano
2018-07-03read-cache.c: move index_has_changes() from merge.cElijah Newren
2018-05-30Merge branch 'ma/unpack-trees-free-msgs'Junio C Hamano
2018-05-22unpack_trees_options: free messages when doneMartin Ågren
2018-05-20merge: setup `opts` later in `checkout_fast_forward()`Martin Ågren
2018-05-02merge: convert empty tree constant to the_hash_algobrian m. carlson
2018-02-28merge: always roll back lock in `checkout_fast_forward()`Martin Ågren
2017-12-22Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano
2017-12-22move index_has_changes() from builtin/am.c to merge.c for reuseElijah Newren
2017-10-07read-cache: leave lock in right state in `write_locked_index()`Martin Ågren
2017-10-06treewide: prefer lockfiles on the stackMartin Ågren
2017-05-08tree: convert parse_tree_indirect to struct object_idbrian m. carlson
2017-05-08merge: convert checkout_fast_forward to struct object_idbrian m. carlson
2016-12-07lockfile: LOCK_REPORT_ON_ERRORJunio C Hamano
2016-09-09sequencer: lib'ify checkout_fast_forward()Johannes Schindelin
2015-11-20Convert struct object to object_idbrian m. carlson
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty
2014-07-16Merge branch 'nd/split-index'Junio C Hamano
2014-06-19merge: use argv_array when spawning merge strategyJeff King
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy
2012-10-29Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy