aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-09-18Merge branch 'pw/3.0-commentchar-auto-deprecation'Junio C Hamano1-0/+3
2025-08-26config: warn on core.commentString=autoPhillip Wood1-0/+3
2025-08-25Merge branch 'ps/commit-graph-wo-globals'Junio C Hamano1-1/+1
2025-08-22Merge branch 'ac/deglobal-fmt-merge-log-config'Junio C Hamano1-1/+2
2025-08-21Merge branch 'jc/string-list-split'Junio C Hamano1-1/+1
2025-08-15commit-graph: stop using `the_repository`Patrick Steinhardt1-1/+1
2025-08-11Merge branch 'rs/merge-compact-summary'Junio C Hamano1-1/+1
2025-08-11environment: remove the global variable 'merge_log_config'Ayush Chandekar1-1/+2
2025-08-09merge: don't document non-existing --compact-summary argumentRené Scharfe1-1/+1
2025-08-02string-list: align string_list_split() with its _in_place() counterpartJunio C Hamano1-1/+1
2025-07-23config: drop `git_config()` wrapperPatrick Steinhardt1-1/+1
2025-06-13merge/pull: extend merge.stat configuration variable to cover --compact-summaryJunio C Hamano1-2/+29
2025-06-13merge/pull: add the "--compact-summary" optionJunio C Hamano1-4/+35
2025-04-24Merge branch 'ps/parse-options-integers'Junio C Hamano1-8/+30
2025-04-17parse-options: introduce precision handling for `OPTION_INTEGER`Patrick Steinhardt1-0/+1
2025-04-17global: use designated initializers for optionsPatrick Steinhardt1-8/+29
2025-04-08builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHMElijah Newren1-13/+1
2025-04-08merge, sequencer: switch recursive merges over to ortElijah Newren1-7/+2
2025-01-17builtins: send usage_with_options() help text to standard outputJunio C Hamano1-2/+2
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
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-12 03:22:11 +0000