aboutsummaryrefslogtreecommitdiffstats
path: root/merge.c
AgeCommit message (Expand)AuthorFilesLines
2024-03-28Merge branch 'eb/hash-transition'Junio C Hamano1-1/+2
2024-03-07Merge branch 'js/merge-tree-3-trees'Junio C Hamano1-1/+4
2024-02-23Always check `parse_tree*()`'s return valueJohannes Schindelin1-1/+4
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-3/+0
2023-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman1-1/+2
2023-06-21diff.h: remove unnecessary include of oidset.hElijah Newren1-0/+2
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-1/+1
2023-06-21merge.h: move declarations for merge.c from cache.hElijah Newren1-0/+1
2023-04-24commit.h: reduce unnecessary includesElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2022-10-30use child_process members "args" and "env" directlyRené Scharfe1-9/+9
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren1-7/+1
2021-07-01dir.[ch]: replace dir_init() with DIR_INITÆvar Arnfjörð Bjarmason1-2/+1
2020-08-18dir: fix problematic API to avoid memory leaksElijah Newren1-1/+2
2020-07-30strvec: rename struct fieldsJeff King1-1/+1
2020-07-28strvec: convert remaining callers away from argv_array nameJeff King1-8/+8
2020-03-16builtin/checkout: compute checkout metadata for checkoutsbrian m. carlson1-0/+1
2019-01-14read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy1-1/+1
2019-01-14repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy1-1/+1
2018-09-21merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-9/+11
2018-08-02Merge branch 'en/dirty-merge-fixes'Junio C Hamano1-31/+0
2018-07-03read-cache.c: move index_has_changes() from merge.cElijah Newren1-31/+0
2018-05-30Merge branch 'ma/unpack-trees-free-msgs'Junio C Hamano1-15/+20
2018-05-22unpack_trees_options: free messages when doneMartin Ågren1-0/+3
2018-05-21merge: setup `opts` later in `checkout_fast_forward()`Martin Ågren1-15/+17
2018-05-02merge: convert empty tree constant to the_hash_algobrian m. carlson1-4/+1
2018-02-28merge: always roll back lock in `checkout_fast_forward()`Martin Ågren1-3/+9
2017-12-22Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano1-0/+33
2017-12-22move index_has_changes() from builtin/am.c to merge.c for reuseElijah Newren1-0/+33
2017-10-07read-cache: leave lock in right state in `write_locked_index()`Martin Ågren1-3/+1
2017-10-06treewide: prefer lockfiles on the stackMartin Ågren1-4/+4
2017-05-08tree: convert parse_tree_indirect to struct object_idbrian m. carlson1-2/+2
2017-05-08merge: convert checkout_fast_forward to struct object_idbrian m. carlson1-4/+4
2016-12-07lockfile: LOCK_REPORT_ON_ERRORJunio C Hamano1-1/+1
2016-09-09sequencer: lib'ify checkout_fast_forward()Johannes Schindelin1-3/+6
2015-11-20Convert struct object to object_idbrian m. carlson1-1/+1
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty1-0/+1
2014-07-16Merge branch 'nd/split-index'Junio C Hamano1-4/+3
2014-06-19merge: use argv_array when spawning merge strategyJeff King1-29/+13
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy1-4/+3
2012-10-29Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy1-0/+112
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 13:18:33 +0000