summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)Author
2024-04-01Merge branch 'pw/checkout-conflict-errorfix'Junio C Hamano
2024-03-28Merge branch 'eb/hash-transition'Junio C Hamano
2024-03-14merge options: add a conflict style memberPhillip Wood
2024-03-14merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano
2024-03-09merge-ort/merge-recursive: do report errors in `merge_submodule()`Johannes Schindelin
2024-03-07Merge branch 'js/merge-tree-3-trees'Junio C Hamano
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin
2024-02-28commit-reach(repo_in_merge_bases_many): report missing commitsJohannes Schindelin
2024-02-26merge-ort: turn submodule conflict suggestions into an advicePhilippe Blain
2024-02-23Always check `parse_tree*()`'s return valueJohannes Schindelin
2024-02-23merge-ort: do check `parse_tree()`'s return valueJohannes Schindelin
2024-02-23merge-tree: fail with a non-zero exit code on missing tree objectsJohannes Schindelin
2024-02-06Merge branch 'jc/comment-style-fixes'Junio C Hamano
2024-01-29merge-ort.c: comment style fixJunio C Hamano
2024-01-19refs: convert AUTO_MERGE to become a normal pseudo-refPatrick Steinhardt
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren
2023-10-29Merge branch 'wx/merge-ort-comment-typofix'Junio C Hamano
2023-10-22merge-ort.c: fix typo 'neeed' to 'needed'王常新
2023-10-18Merge branch 'jc/merge-ort-attr-index-fix'Junio C Hamano
2023-10-09merge-ort: initialize repo in index stateJohn Cai
2023-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman
2023-09-17merge-ort: lowercase a few error messagesJeff King
2023-09-14merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()Jeff King
2023-09-14merge-ort: drop unused parameters from detect_and_process_renames()Jeff King
2023-09-14merge-ort: stop passing "opt" to read_oid_strbuf()Jeff King
2023-09-14merge-ort: drop custom err() functionJeff King
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren
2023-06-21merge-ll: rename from ll-mergeElijah Newren
2023-06-21repository: remove unnecessary include of path.hElijah Newren
2023-06-21cache.h: remove this no-longer-used headerElijah Newren
2023-06-21read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren
2023-06-21sparse-index.h: move declarations for sparse-index.c from cache.hElijah Newren
2023-05-09Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano
2023-05-02Merge branch 'en/ort-finalize-after-0-merges-fix'Junio C Hamano
2023-04-24merge-ort: fix calling merge_finalize() with no intermediate mergeElijah Newren
2023-04-24match-trees.h: move declarations for match-trees.c functions from cache.hElijah 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 mem-pool.hElijah Newren
2023-04-11treewide: be explicit about dependence on oid-array.hElijah Newren
2023-04-11treewide: be explicit about dependence on trace.h & trace2.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 "promisor-remote.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "object-store.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-21environment.h: move declarations for environment.c functions from cache.hElijah Newren
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren
2023-02-24cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren
2022-10-31Merge branch 'en/ort-dir-rename-and-symlink-fix'Taylor Blau
generated by cgit v0.10.2-6-g49f6 at 2024-06-03 03:42:12 (GMT)