aboutsummaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)Author
2025-03-17merge-ort: remove extraneous word in commentElijah Newren
2025-03-17merge-ort: fix accidental strset<->strintmapElijah Newren
2025-03-10hash: stop depending on `the_repository` in `null_oid()`Patrick Steinhardt
2025-03-06merge-ort: fix slightly overzealous assertion for rename-to-selfElijah Newren
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt
2024-09-30diff: improve lifecycle management of diff queuesPatrick Steinhardt
2024-09-25Merge branch 'ak/typofix-2.46-maint'Junio C Hamano
2024-09-19merge-ort: fix typosAndrew Kreimer
2024-09-05merge-ort: fix two leaks when handling directory rename modificationsPatrick Steinhardt
2024-08-14merge-ort: unconditionally release attributes indexPatrick Steinhardt
2024-07-16Merge branch 'en/ort-inner-merge-error-fix'Junio C Hamano
2024-07-08Merge branch 'ps/leakfixes-more'Junio C Hamano
2024-07-06merge-ort: fix missing early returnElijah Newren
2024-06-20merge-ort: convert more error() cases to path_msg()Elijah Newren
2024-06-20merge-ort: upon merge abort, only show messages causing the abortElijah Newren
2024-06-20merge-ort: loosen commented requirementsElijah Newren
2024-06-20merge-ort: clearer propagation of failure-to-function from merge_submoduleElijah Newren
2024-06-20merge-ort: fix type of local 'clean' var in handle_content_merge ()Elijah Newren
2024-06-20merge-ort: maintain expected invariant for priv memberElijah Newren
2024-06-20merge-ort: extract handling of priv member into reusable functionElijah Newren
2024-06-14global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt
2024-06-11merge: fix leaking merge basesPatrick Steinhardt
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-30Merge branch 'wx/merge-ort-comment-typofix'Junio C Hamano
2023-10-21merge-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-16merge-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
generated by cgit v1.3 (git 2.53.0) at 2026-04-15 12:12:39 +0000