Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)Author
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-22merge-ort.c: fix typo 'neeed' to 'needed'王常新
2023-10-18Merge branch 'jc/merge-ort-attr-index-fix'Junio C Hamano
2023-10-10merge-ort: initialize repo in index stateJohn Cai
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-10Merge 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-25merge-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
2022-10-28Merge branch 'jk/unused-anno-more'Junio C Hamano
2022-10-23merge-ort: fix bug with dir rename vs change dir to symlinkElijah Newren
2022-10-18string-list: mark unused callback parametersJeff King
2022-09-28merge-ort: return early when failing to write a blobJohannes Schindelin
2022-09-28merge-ort: fix segmentation fault in read-only repositoriesJohannes Schindelin
2022-08-30Merge branch 'en/ort-unused-code-removal'Junio C Hamano
2022-08-26Merge branch 'en/submodule-merge-messages-fixes'Junio C Hamano
2022-08-19merge-ort: remove code obsoleted by other changesElijah Newren
2022-08-18merge-ort: provide helpful submodule update message when possibleElijah Newren
2022-08-18merge-ort: avoid surprise with new sub_flag variableElijah Newren
2022-08-18merge-ort: remove translator lego in new "submodule conflict suggestion"Elijah Newren
2022-08-08Merge branch 'js/ort-clean-up-after-failed-merge'Junio C Hamano
2022-08-04submodule merge: update conflict error messageCalvin Wan
2022-08-01merge-ort: do leave trace2 region even if checkout failsJohannes Schindelin
2022-08-01merge-ort: clean up after failed mergeJohannes Schindelin
2022-07-18Merge branch 'en/merge-dual-dir-renames-fix'Junio C Hamano
2022-07-06merge-ort: fix issue with dual rename and add/add conflictElijah Newren
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-29 09:13:58 +0300