summaryrefslogtreecommitdiffstats
path: root/merge-ort.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/ort-inner-merge-error-fix'Junio C Hamano2024-07-161-45/+124
|\
| * merge-ort: fix missing early returnElijah Newren2024-07-061-0/+1
| * merge-ort: convert more error() cases to path_msg()Elijah Newren2024-06-201-12/+41
| * merge-ort: upon merge abort, only show messages causing the abortElijah Newren2024-06-201-25/+53
| * merge-ort: loosen commented requirementsElijah Newren2024-06-201-1/+1
| * merge-ort: clearer propagation of failure-to-function from merge_submoduleElijah Newren2024-06-201-0/+2
| * merge-ort: fix type of local 'clean' var in handle_content_merge ()Elijah Newren2024-06-201-2/+3
| * merge-ort: maintain expected invariant for priv memberElijah Newren2024-06-201-1/+2
| * merge-ort: extract handling of priv member into reusable functionElijah Newren2024-06-201-5/+22
* | Merge branch 'ps/leakfixes-more'Junio C Hamano2024-07-081-4/+8
|\ \
| * | merge: fix leaking merge basesPatrick Steinhardt2024-06-111-4/+8
| |/
* / global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt2024-06-141-0/+2
|/
* Merge branch 'pw/checkout-conflict-errorfix'Junio C Hamano2024-04-011-1/+2
|\
| * merge options: add a conflict style memberPhillip Wood2024-03-141-0/+1
| * merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood2024-03-141-1/+1
* | Merge branch 'eb/hash-transition'Junio C Hamano2024-03-281-5/+6
|\ \
| * | tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman2023-10-021-5/+6
* | | Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano2024-03-111-11/+81
|\ \ \
| * | | merge-ort/merge-recursive: do report errors in `merge_submodule()`Johannes Schindelin2024-03-091-0/+5
| * | | commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin2024-02-291-1/+5
| * | | commit-reach(repo_in_merge_bases_many): report missing commitsJohannes Schindelin2024-02-281-10/+71
| | |/ | |/|
* | | Merge branch 'js/merge-tree-3-trees'Junio C Hamano2024-03-081-5/+11
|\ \ \
| * | | Always check `parse_tree*()`'s return valueJohannes Schindelin2024-02-231-0/+3
| * | | merge-ort: do check `parse_tree()`'s return valueJohannes Schindelin2024-02-231-2/+4
| * | | merge-tree: fail with a non-zero exit code on missing tree objectsJohannes Schindelin2024-02-231-3/+4
* | | | merge-ort: turn submodule conflict suggestions into an advicePhilippe Blain2024-02-261-1/+2
| |/ / |/| |
* | | Merge branch 'jc/comment-style-fixes'Junio C Hamano2024-02-061-1/+1
|\ \ \
| * | | merge-ort.c: comment style fixJunio C Hamano2024-01-291-1/+1
| |/ /
* | | refs: convert AUTO_MERGE to become a normal pseudo-refPatrick Steinhardt2024-01-191-7/+12
* | | treewide: remove unnecessary includes in source filesElijah Newren2023-12-261-1/+0
* | | treewide: remove unnecessary includes in source filesElijah Newren2023-12-261-2/+0
|/ /
* | Merge branch 'wx/merge-ort-comment-typofix'Junio C Hamano2023-10-291-1/+1
|\ \
| * | merge-ort.c: fix typo 'neeed' to 'needed'王常新2023-10-221-1/+1
* | | Merge branch 'jc/merge-ort-attr-index-fix'Junio C Hamano2023-10-181-0/+1
|\ \ \
| * | | merge-ort: initialize repo in index stateJohn Cai2023-10-091-0/+1
* | | | merge-ort: lowercase a few error messagesJeff King2023-09-171-2/+2
* | | | merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()Jeff King2023-09-141-3/+2
* | | | merge-ort: drop unused parameters from detect_and_process_renames()Jeff King2023-09-141-6/+2
* | | | merge-ort: stop passing "opt" to read_oid_strbuf()Jeff King2023-09-141-4/+3
* | | | merge-ort: drop custom err() functionJeff King2023-09-141-23/+5
| |_|/ |/| |
* | | object-store-ll.h: split this header out of object-store.hElijah Newren2023-06-211-1/+1
* | | merge-ll: rename from ll-mergeElijah Newren2023-06-211-1/+1
* | | repository: remove unnecessary include of path.hElijah Newren2023-06-211-0/+1
* | | cache.h: remove this no-longer-used headerElijah Newren2023-06-211-1/+1
* | | read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren2023-06-211-0/+1
* | | sparse-index.h: move declarations for sparse-index.c from cache.hElijah Newren2023-06-211-0/+1
|/ /
* | Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano2023-05-101-0/+1
|\ \
| * | match-trees.h: move declarations for match-trees.c functions from cache.hElijah Newren2023-04-241-0/+1
* | | Merge branch 'en/ort-finalize-after-0-merges-fix'Junio C Hamano2023-05-021-4/+4
|\ \ \ | |/ / |/| |
| * | merge-ort: fix calling merge_finalize() with no intermediate mergeElijah Newren2023-04-241-4/+4
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 12:08:12 +0100