aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge-tree.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2024-12-06global: trivial conversions to fix `-Wsign-compare` warningsPatrick Steinhardt1-4/+2
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt1-0/+2
2024-09-23Merge branch 'jc/pass-repo-to-builtins'Junio C Hamano1-2/+5
2024-09-13builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.hJohn Cai1-1/+1
2024-09-13builtin: add a repository parameter for builtin functionsJohn Cai1-1/+4
2024-08-22builtin/merge-tree: fix leaking `-X` strategy optionsPatrick Steinhardt1-3/+10
2024-07-13merge-recursive: honor diff.algorithmAntonin Delpeuch1-1/+1
2024-06-11merge: fix leaking merge basesPatrick Steinhardt1-0/+1
2024-04-18builtin: stop using `the_index`Patrick Steinhardt1-2/+1
2024-04-12Merge branch 'js/merge-tree-3-trees'Junio C Hamano1-1/+1
2024-04-12merge-tree: fix argument type of the `--merge-base` optionJohannes Schindelin1-1/+1
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano1-2/+3
2024-03-07Merge branch 'js/merge-tree-3-trees'Junio C Hamano1-17/+31
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-2/+3
2024-02-23Always check `parse_tree*()`'s return valueJohannes Schindelin1-0/+6
2024-01-29merge-tree: accept 3 trees as argumentsJohannes Schindelin1-17/+25
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano1-1/+0
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-1/+0
2023-11-27i18n: factorize even more 'incompatible options' messagesRené Scharfe1-1/+2
2023-10-11merge: introduce {copy|clear}_merge_options()Junio C Hamano1-1/+3
2023-09-25merge-tree: add -X strategy optionTang Yuyi1-3/+15
2023-07-13merge-tree: mark unused parameter in traverse callbackJeff King1-1/+3
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren1-1/+1
2023-06-03surround %s with quotes when failed to lookup commitTeng Long1-1/+1
2023-05-15Merge branch 'ds/merge-tree-use-config'Junio C Hamano1-0/+3
2023-05-10merge-tree: load default git configDerrick Stolee1-0/+3
2023-04-24commit.h: reduce unnecessary includesElijah Newren1-0/+1
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-7/+11
2023-03-28cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-3/+6
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-3/+3
2023-03-28cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+2
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2022-12-26Merge branch 'jk/unused-post-2.39'Junio C Hamano1-1/+1
2022-12-14Merge branch 'kz/merge-tree-merge-base'Junio C Hamano1-12/+53
2022-12-13diff: mark unused parameters in callbacksJeff King1-1/+1
2022-11-21{builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"Ævar Arnfjörð Bjarmason1-1/+1
2022-11-12merge-tree.c: allow specifying the merge-base when --stdin is passedKyle Zhao1-2/+19
2022-11-12merge-tree.c: add --merge-base=<commit> optionKyle Zhao1-11/+35
2022-10-22merge-tree: support multiple batched merges with --stdinElijah Newren1-3/+39
2022-06-22merge-tree: add a --allow-unrelated-histories flagElijah Newren1-1/+6
2022-06-22merge-tree: allow `ls-files -u` style info to be NUL terminatedElijah Newren1-1/+3
2022-06-22merge-ort: optionally produce machine-readable outputElijah Newren1-1/+2
2022-06-22merge-tree: provide easy access to `ls-files -u` style infoElijah Newren1-1/+10
2022-06-22merge-tree: provide a list of which files have conflictsElijah Newren1-3/+23
2022-06-22merge-tree: support including merge messages in outputElijah Newren1-2/+19
2022-06-22merge-tree: implement real mergesElijah Newren1-1/+40
2022-06-22merge-tree: add option parsing and initial shell for real merge functionElijah Newren1-9/+75
2022-06-22merge-tree: move logic for existing merge into new functionElijah Newren1-4/+8
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-13 09:35:28 +0000