summaryrefslogtreecommitdiffstats
path: root/builtin/merge.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2024-01-19refs: convert MERGE_AUTOSTASH to become a normal pseudo-refPatrick Steinhardt1-14/+13
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano1-4/+0
2024-01-02Merge branch 'la/trailer-cleanups'Junio C Hamano1-1/+1
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-4/+0
2023-10-20commit: ignore_non_trailer computes number of bytes to ignoreLinus Arver1-1/+1
2023-10-13Merge branch 'jk/commit-graph-leak-fixes'Junio C Hamano1-1/+4
2023-10-03merge: free result of repo_get_merge_bases()Jeff King1-1/+4
2023-09-29diff --stat: set the width defaults in a helper functionDragan Simic1-3/+1
2023-09-18diff --stat: add config option to limit filename widthDragan Simic1-0/+1
2023-09-05merge: do not pass unused opt->value parameterJeff King1-1/+1
2023-09-05parse-options: mark unused "opt" parameter in callbacksJeff King1-1/+1
2023-08-31merge: simplify parsing of "-n" optionJeff King1-11/+2
2023-08-31merge: make xopts a strvecJeff King1-19/+7
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano1-2/+0
2023-07-06Merge branch 'gc/config-context'Junio C Hamano1-3/+4
2023-07-06Merge branch 'cw/strbuf-cleanup'Junio C Hamano1-4/+6
2023-07-05git-compat-util: move alloc macros to git-compat-util.hCalvin Wan1-1/+0
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan1-1/+0
2023-06-28config: add ctx arg to config_fn_tGlen Choo1-3/+4
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
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-06 08:07:31 +0000