summaryrefslogtreecommitdiffstats
path: root/merge-ort.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | object-name.h: move declarations for object-name.c functions from cache.hElijah Newren2023-04-111-0/+1
* | | treewide: be explicit about dependence on mem-pool.hElijah Newren2023-04-111-0/+1
* | | treewide: be explicit about dependence on oid-array.hElijah Newren2023-04-111-0/+1
* | | treewide: be explicit about dependence on trace.h & trace2.hElijah Newren2023-04-111-0/+1
* | | Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-3/+3
|\ \ \
| * | | cocci: apply the "promisor-remote.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| * | | cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| * | | cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
* | | | environment.h: move declarations for environment.c functions from cache.hElijah Newren2023-03-211-0/+1
* | | | 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 'en/ort-dir-rename-and-symlink-fix'Taylor Blau2022-10-311-2/+34
|\ \ \
| * | | merge-ort: fix bug with dir rename vs change dir to symlinkElijah Newren2022-10-231-2/+34
| |/ /
* | | Merge branch 'jk/unused-anno-more'Junio C Hamano2022-10-271-1/+1
|\ \ \ | |/ / |/| |
| * | string-list: mark unused callback parametersJeff King2022-10-181-1/+1
* | | merge-ort: return early when failing to write a blobJohannes Schindelin2022-09-281-9/+19
* | | merge-ort: fix segmentation fault in read-only repositoriesJohannes Schindelin2022-09-281-25/+41
|/ /
* | Merge branch 'en/ort-unused-code-removal'Junio C Hamano2022-08-291-20/+2
|\ \
| * | merge-ort: remove code obsoleted by other changesElijah Newren2022-08-191-20/+2
* | | Merge branch 'en/submodule-merge-messages-fixes'Junio C Hamano2022-08-251-9/+116
|\ \ \ | |/ / |/| |
| * | merge-ort: provide helpful submodule update message when possibleElijah Newren2022-08-181-11/+7
| * | merge-ort: avoid surprise with new sub_flag variableElijah Newren2022-08-181-1/+1
| * | merge-ort: remove translator lego in new "submodule conflict suggestion"Elijah Newren2022-08-181-60/+28
| * | submodule merge: update conflict error messageCalvin Wan2022-08-041-9/+152
* | | Merge branch 'js/ort-clean-up-after-failed-merge'Junio C Hamano2022-08-081-0/+5
|\ \ \ | |/ / |/| |
| * | merge-ort: do leave trace2 region even if checkout failsJohannes Schindelin2022-08-011-0/+3
| * | merge-ort: clean up after failed mergeJohannes Schindelin2022-08-011-0/+2
* | | Merge branch 'en/merge-dual-dir-renames-fix'Junio C Hamano2022-07-181-26/+48
|\ \ \
| * | | merge-ort: fix issue with dual rename and add/add conflictElijah Newren2022-07-061-1/+7
| * | | merge-ort: shuffle the computation and cleanup of potential collisionsElijah Newren2022-07-061-5/+15
| * | | merge-ort: make a separate function for freeing struct collisionsElijah Newren2022-07-061-16/+22
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 00:17:25 +0100