aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)Author
2024-03-12prefer comment_line_str to comment_line_char for printingJeff King
2024-03-12strbuf: accept a comment string for strbuf_commented_addf()Jeff King
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano
2024-02-29commit-reach(get_octopus_merge_bases): pass on "missing commits" errorsJohannes Schindelin
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin
2024-02-26Merge branch 'rs/use-xstrncmpz'Junio C Hamano
2024-02-12use xstrncmpz()René Scharfe
2024-02-08Merge branch 'en/header-cleanup' into maint-2.43Junio C Hamano
2024-02-08Merge branch 'la/trailer-cleanups' into maint-2.43Junio C Hamano
2024-01-19refs: convert MERGE_AUTOSTASH to become a normal pseudo-refPatrick Steinhardt
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano
2024-01-02Merge branch 'la/trailer-cleanups'Junio C Hamano
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren
2023-10-20commit: ignore_non_trailer computes number of bytes to ignoreLinus Arver
2023-10-13Merge branch 'jk/commit-graph-leak-fixes'Junio C Hamano
2023-10-03merge: free result of repo_get_merge_bases()Jeff King
2023-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman
2023-09-29diff --stat: set the width defaults in a helper functionDragan Simic
2023-09-18diff --stat: add config option to limit filename widthDragan Simic
2023-09-05merge: do not pass unused opt->value parameterJeff King
2023-09-05parse-options: mark unused "opt" parameter in callbacksJeff King
2023-08-31merge: simplify parsing of "-n" optionJeff King
2023-08-31merge: make xopts a strvecJeff King
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano
2023-07-06Merge branch 'gc/config-context'Junio C Hamano
2023-07-06Merge branch 'cw/strbuf-cleanup'Junio C Hamano
2023-07-05git-compat-util: move alloc macros to git-compat-util.hCalvin Wan
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan
2023-06-28config: add ctx arg to config_fn_tGlen Choo
2023-06-21repository: remove unnecessary include of path.hElijah Newren
2023-06-21cache.h: remove this no-longer-used headerElijah Newren
2023-06-21merge.h: move declarations for merge.c from cache.hElijah Newren
2023-06-12strbuf: remove global variableCalvin Wan
2023-04-11editor: move editor-related functions and declarations into common fileElijah Newren
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren
2023-04-11treewide: be explicit about dependence on advice.hElijah Newren
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano
2023-03-28cocci: apply the "refs.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren
2023-03-21abspath.h: move absolute path functions from cache.hElijah Newren
2023-03-21environment: move comment_line_char from cache.hElijah Newren
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren
2023-03-17Merge branch 'jc/gpg-lazy-init'Junio C Hamano
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren
2023-02-23alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren
2023-02-22Merge branch 'ab/various-leak-fixes'Junio C Hamano
2023-02-10cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS"Ævar Arnfjörð Bjarmason
generated by cgit v1.3 (git 2.53.0) at 2026-04-15 07:58:21 +0000