aboutsummaryrefslogtreecommitdiffstats
path: root/merge-ort.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt1-0/+1
2024-09-30diff: improve lifecycle management of diff queuesPatrick Steinhardt1-1/+1
2024-09-25Merge branch 'ak/typofix-2.46-maint'Junio C Hamano1-2/+2
2024-09-19merge-ort: fix typosAndrew Kreimer1-2/+2
2024-09-05merge-ort: fix two leaks when handling directory rename modificationsPatrick Steinhardt1-1/+3
2024-08-14merge-ort: unconditionally release attributes indexPatrick Steinhardt1-2/+1
2024-07-16Merge branch 'en/ort-inner-merge-error-fix'Junio C Hamano1-45/+124
2024-07-08Merge branch 'ps/leakfixes-more'Junio C Hamano1-4/+8
2024-07-06merge-ort: fix missing early returnElijah Newren1-0/+1
2024-06-20merge-ort: convert more error() cases to path_msg()Elijah Newren1-12/+41
2024-06-20merge-ort: upon merge abort, only show messages causing the abortElijah Newren1-25/+53
2024-06-20merge-ort: loosen commented requirementsElijah Newren1-1/+1
2024-06-20merge-ort: clearer propagation of failure-to-function from merge_submoduleElijah Newren1-0/+2
2024-06-20merge-ort: fix type of local 'clean' var in handle_content_merge ()Elijah Newren1-2/+3
2024-06-20merge-ort: maintain expected invariant for priv memberElijah Newren1-1/+2
2024-06-20merge-ort: extract handling of priv member into reusable functionElijah Newren1-5/+22
2024-06-14global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt1-0/+2
2024-06-11merge: fix leaking merge basesPatrick Steinhardt1-4/+8
2024-04-01Merge branch 'pw/checkout-conflict-errorfix'Junio C Hamano1-1/+2
2024-03-28Merge branch 'eb/hash-transition'Junio C Hamano1-5/+6
2024-03-14merge options: add a conflict style memberPhillip Wood1-0/+1
2024-03-14merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood1-1/+1
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano1-11/+81
2024-03-09merge-ort/merge-recursive: do report errors in `merge_submodule()`Johannes Schindelin1-0/+5
2024-03-07Merge branch 'js/merge-tree-3-trees'Junio C Hamano1-5/+11
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-1/+5
2024-02-28commit-reach(repo_in_merge_bases_many): report missing commitsJohannes Schindelin1-10/+71
2024-02-26merge-ort: turn submodule conflict suggestions into an advicePhilippe Blain1-1/+2
2024-02-23Always check `parse_tree*()`'s return valueJohannes Schindelin1-0/+3
2024-02-23merge-ort: do check `parse_tree()`'s return valueJohannes Schindelin1-2/+4
2024-02-23merge-tree: fail with a non-zero exit code on missing tree objectsJohannes Schindelin1-3/+4
2024-02-06Merge branch 'jc/comment-style-fixes'Junio C Hamano1-1/+1
2024-01-29merge-ort.c: comment style fixJunio C Hamano1-1/+1
2024-01-19refs: convert AUTO_MERGE to become a normal pseudo-refPatrick Steinhardt1-7/+12
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-1/+0
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-2/+0
2023-10-30Merge branch 'wx/merge-ort-comment-typofix'Junio C Hamano1-1/+1
2023-10-21merge-ort.c: fix typo 'neeed' to 'needed'王常新1-1/+1
2023-10-18Merge branch 'jc/merge-ort-attr-index-fix'Junio C Hamano1-0/+1
2023-10-09merge-ort: initialize repo in index stateJohn Cai1-0/+1
2023-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman1-5/+6
2023-09-16merge-ort: lowercase a few error messagesJeff King1-2/+2
2023-09-14merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()Jeff King1-3/+2
2023-09-14merge-ort: drop unused parameters from detect_and_process_renames()Jeff King1-6/+2
2023-09-14merge-ort: stop passing "opt" to read_oid_strbuf()Jeff King1-4/+3
2023-09-14merge-ort: drop custom err() functionJeff King1-23/+5
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren1-1/+1
2023-06-21merge-ll: rename from ll-mergeElijah Newren1-1/+1
2023-06-21repository: remove unnecessary include of path.hElijah Newren1-0/+1
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-06 20:01:45 +0000