aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2024-12-23Merge branch 'ps/build-sign-compare'Junio C Hamano1-0/+3
2024-12-15Merge branch 'jc/forbid-head-as-tagname'Junio C Hamano1-1/+1
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt1-0/+3
2024-12-03refs: drop strbuf_ prefix from helpersJunio C Hamano1-1/+1
2024-11-04builtin/merge: release output buffer after performing mergePatrick Steinhardt1-0/+1
2024-09-23Merge branch 'jc/pass-repo-to-builtins'Junio C Hamano1-4/+8
2024-09-13builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.hJohn Cai1-1/+2
2024-09-13builtin: add a repository parameter for builtin functionsJohn Cai1-3/+6
2024-09-12environment: make `get_index_file()` accept a repositoryPatrick Steinhardt1-6/+8
2024-09-12environment: make `get_git_dir()` accept a repositoryPatrick Steinhardt1-1/+3
2024-08-13hooks: remove implicit dependency on `the_repository`Patrick Steinhardt1-1/+1
2024-07-13merge-recursive: honor diff.algorithmAntonin Delpeuch1-1/+1
2024-07-08Merge branch 'ps/leakfixes-more'Junio C Hamano1-4/+14
2024-07-02Merge branch 'ps/use-the-repository'Junio C Hamano1-3/+4
2024-06-18merge: avoid write merge state when unable to write indexKyle Zhao1-1/+1
2024-06-14hash: require hash algorithm in `empty_tree_oid_hex()`Patrick Steinhardt1-1/+2
2024-06-14hash: require hash algorithm in `oidread()` and `oidclr()`Patrick Steinhardt1-2/+2
2024-06-11merge: fix leaking merge basesPatrick Steinhardt1-0/+2
2024-06-11builtin/merge: fix leaking `struct cmdnames` in `get_strategy()`Patrick Steinhardt1-3/+7
2024-06-11commit: fix leaking parents when calling `commit_tree_extended()`Patrick Steinhardt1-1/+5
2024-06-07builtin/merge: always store allocated strings in `pull_twohead`Patrick Steinhardt1-7/+11
2024-05-27config: clarify memory ownership in `git_config_string()`Patrick Steinhardt1-2/+2
2024-05-16Merge branch 'ps/refs-without-the-repository'Junio C Hamano1-12/+22
2024-05-07cocci: apply rules to rewrite callers of "refs" interfacesPatrick Steinhardt1-12/+22
2024-04-18builtin: stop using `the_index`Patrick Steinhardt1-16/+15
2024-04-05Merge branch 'jk/core-comment-string'Junio C Hamano1-6/+6
2024-03-28Merge branch 'eb/hash-transition'Junio C Hamano1-1/+2
2024-03-12prefer comment_line_str to comment_line_char for printingJeff King1-2/+2
2024-03-12strbuf: accept a comment string for strbuf_commented_addf()Jeff King1-4/+4
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano1-9/+17
2024-02-29commit-reach(get_octopus_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-1/+5
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-8/+12
2024-02-26Merge branch 'rs/use-xstrncmpz'Junio C Hamano1-2/+1
2024-02-12use xstrncmpz()René Scharfe1-2/+1
2024-02-08Merge branch 'en/header-cleanup' into maint-2.43Junio C Hamano1-4/+0
2024-02-08Merge branch 'la/trailer-cleanups' into maint-2.43Junio C Hamano1-1/+1
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-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman1-1/+2
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
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-13 03:55:11 +0000