summaryrefslogtreecommitdiffstats
path: root/builtin/merge-tree.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano2024-03-111-2/+3
|\
| * commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin2024-02-291-2/+3
* | Merge branch 'js/merge-tree-3-trees'Junio C Hamano2024-03-081-17/+31
|\ \ | |/ |/|
| * Always check `parse_tree*()`'s return valueJohannes Schindelin2024-02-231-0/+6
| * merge-tree: accept 3 trees as argumentsJohannes Schindelin2024-01-291-17/+25
* | Merge branch 'en/header-cleanup'Junio C Hamano2024-01-081-1/+0
|\ \
| * | treewide: remove unnecessary includes in source filesElijah Newren2023-12-261-1/+0
| |/
* / i18n: factorize even more 'incompatible options' messagesRené Scharfe2023-11-271-1/+2
|/
* merge: introduce {copy|clear}_merge_options()Junio C Hamano2023-10-111-1/+3
* merge-tree: add -X strategy optionTang Yuyi2023-09-251-3/+15
* merge-tree: mark unused parameter in traverse callbackJeff King2023-07-141-1/+3
* object-store-ll.h: split this header out of object-store.hElijah Newren2023-06-211-1/+1
* surround %s with quotes when failed to lookup commitTeng Long2023-06-031-1/+1
* Merge branch 'ds/merge-tree-use-config'Junio C Hamano2023-05-151-0/+3
|\
| * merge-tree: load default git configDerrick Stolee2023-05-101-0/+3
* | commit.h: reduce unnecessary includesElijah Newren2023-04-241-0/+1
* | object-name.h: move declarations for object-name.c functions from cache.hElijah Newren2023-04-111-0/+1
* | Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-7/+11
|\ \
| * | cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-3/+6
| * | cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-3/+3
| * | cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+2
| |/
* | treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
* | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-241-0/+1
|/
* Merge branch 'jk/unused-post-2.39'Junio C Hamano2022-12-261-1/+1
|\
| * diff: mark unused parameters in callbacksJeff King2022-12-131-1/+1
* | Merge branch 'kz/merge-tree-merge-base'Junio C Hamano2022-12-141-12/+53
|\ \ | |/ |/|
| * merge-tree.c: allow specifying the merge-base when --stdin is passedKyle Zhao2022-11-131-2/+19
| * merge-tree.c: add --merge-base=<commit> optionKyle Zhao2022-11-131-11/+35
* | {builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"Ævar Arnfjörð Bjarmason2022-11-211-1/+1
|/
* merge-tree: support multiple batched merges with --stdinElijah Newren2022-10-231-3/+39
* merge-tree: add a --allow-unrelated-histories flagElijah Newren2022-06-231-1/+6
* merge-tree: allow `ls-files -u` style info to be NUL terminatedElijah Newren2022-06-231-1/+3
* merge-ort: optionally produce machine-readable outputElijah Newren2022-06-231-1/+2
* merge-tree: provide easy access to `ls-files -u` style infoElijah Newren2022-06-231-1/+10
* merge-tree: provide a list of which files have conflictsElijah Newren2022-06-231-3/+23
* merge-tree: support including merge messages in outputElijah Newren2022-06-231-2/+19
* merge-tree: implement real mergesElijah Newren2022-06-231-1/+40
* merge-tree: add option parsing and initial shell for real merge functionElijah Newren2022-06-231-9/+75
* merge-tree: move logic for existing merge into new functionElijah Newren2022-06-231-4/+8
* merge-tree: rename merge_trees() to trivial_merge_trees()Elijah Newren2022-06-231-4/+4
* xdiff users: use designated initializers for out_lineÆvar Arnfjörð Bjarmason2021-05-111-4/+1
* merge-base, xdiff: zero out xpparam_t structuresMichał Kępień2020-10-201-0/+1
* Merge branch 'jk/tree-walk-overflow'Junio C Hamano2019-08-221-2/+3
|\
| * tree-walk: add a strbuf wrapper for make_traverse_path()Jeff King2019-08-011-2/+3
| * tree-walk: accept a raw length for traverse_path_len()Jeff King2019-08-011-1/+1
| * tree-walk: drop oid from traverse_infoJeff King2019-07-311-1/+1
| * setup_traverse_info(): stop copying oidJeff King2019-07-311-1/+1
* | tree-walk.c: remove the_repo from fill_tree_descriptor()Nguyễn Thái Ngọc Duy2019-06-271-9/+13
|/
* Merge branch 'nd/the-index-final'Junio C Hamano2019-02-071-1/+3
|\
| * cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-241-1/+3
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 20:24:04 +0100