aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2023-07-06Merge branch 'cw/strbuf-cleanup'Junio C Hamano1-4/+6
2023-06-21repository: remove unnecessary include of path.hElijah Newren1-0/+1
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-2/+1
2023-06-21merge.h: move declarations for merge.c from cache.hElijah Newren1-0/+1
2023-06-12strbuf: remove global variableCalvin Wan1-4/+6
2023-04-11editor: move editor-related functions and declarations into common fileElijah Newren1-0/+1
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on advice.hElijah Newren1-0/+1
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-9/+14
2023-03-28cocci: apply the "refs.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+2
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+2
2023-03-28cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-2/+5
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-5/+5
2023-03-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren1-0/+1
2023-03-21abspath.h: move absolute path functions from cache.hElijah Newren1-0/+1
2023-03-21environment: move comment_line_char from cache.hElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-03-17Merge branch 'jc/gpg-lazy-init'Junio C Hamano1-3/+0
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2023-02-23alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren1-0/+1
2023-02-22Merge branch 'ab/various-leak-fixes'Junio C Hamano1-8/+6
2023-02-10cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS"Ævar Arnfjörð Bjarmason1-3/+3
2023-02-10cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*"Ævar Arnfjörð Bjarmason1-1/+1
2023-02-09gpg-interface: lazily initialize and read the configurationJunio C Hamano1-3/+0
2023-02-06builtin/merge.c: free "&buf" on "Your local changes..." errorÆvar Arnfjörð Bjarmason1-1/+2
2023-02-06builtin/merge.c: use fixed strings, not "strbuf", fix leakÆvar Arnfjörð Bjarmason1-7/+4
2023-01-13merge: break out of all_strategy loop when strategy is foundSeija Kijin1-1/+1
2022-12-26Merge branch 'jk/unused-post-2.39'Junio C Hamano1-1/+1
2022-12-14Merge branch 'ab/various-leak-fixes'Junio C Hamano1-0/+1
2022-12-13diff: mark unused parameters in callbacksJeff King1-1/+1
2022-11-21{reset,merge}: call discard_index() before returningÆvar Arnfjörð Bjarmason1-0/+1
2022-11-21cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason1-7/+12
2022-11-21cocci & cache.h: apply variable section of "pending" index-compatibilityÆvar Arnfjörð Bjarmason1-3/+3
2022-11-21cocci & cache.h: apply a selection of "pending" index-compatibilityÆvar Arnfjörð Bjarmason1-1/+1
2022-11-21read-cache API & users: make discard_index() return voidÆvar Arnfjörð Bjarmason1-1/+2
2022-11-21cocci & cache.h: remove rarely used "the_index" compat macrosÆvar Arnfjörð Bjarmason1-1/+1
2022-10-30use child_process members "args" and "env" directlyRené Scharfe1-5/+5
2022-10-30use child_process member "args" instead of string array variableRené Scharfe1-20/+12
2022-10-30merge: remove always-the-same "verbose" argumentsÆvar Arnfjörð Bjarmason1-8/+5
2022-09-01Merge branch 'en/merge-multi-strategies'Junio C Hamano1-9/+11
2022-09-01Merge branch 'en/merge-unstash-only-on-clean-merge'Junio C Hamano1-1/+4
2022-08-24merge: small code readability improvementElijah Newren1-3/+3
2022-08-24merge: cleanup confusing logic for handling successful mergesElijah Newren1-7/+9
2022-08-24merge: only apply autostash when appropriateElijah Newren1-1/+4
2022-07-22merge: do not exit restore_state() prematurelyElijah Newren1-4/+6
2022-07-22merge: ensure we can actually restore pre-merge stateElijah Newren1-5/+5
2022-07-22merge: make restore_state() restore staged state tooElijah Newren1-3/+5
2022-07-22merge: fix save_state() to work when there are stat-dirty filesElijah Newren1-0/+8
2022-07-22merge: do not abort early if one strategy fails to handle the mergeElijah Newren1-2/+4
2022-07-22merge: abort if index does not match HEAD for trivial mergesElijah Newren1-0/+15
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-04 16:15:12 +0000