summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)Author
2022-10-31Merge branch 'en/ort-dir-rename-and-symlink-fix'Taylor Blau
2022-10-27Merge branch 'jk/unused-anno-more'Junio C Hamano
2022-10-22merge-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-29Merge branch 'en/ort-unused-code-removal'Junio C Hamano
2022-08-25Merge 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
2022-07-06merge-ort: shuffle the computation and cleanup of potential collisionsElijah Newren
2022-07-06merge-ort: make a separate function for freeing struct collisionsElijah Newren
2022-07-06merge-ort: small cleanups of check_for_directory_renameElijah Newren
2022-06-22merge-ort: optionally produce machine-readable outputElijah Newren
2022-06-22merge-ort: store more specific conflict informationElijah Newren
2022-06-22merge-ort: make `path_messages` a strmap to a string_listJohannes Schindelin
2022-06-22merge-ort: store messages in a list, not in a single strbufJohannes Schindelin
2022-06-22merge-ort: remove command-line-centric submodule message from merge-ortElijah Newren
2022-06-22merge-ort: provide a merge_get_conflicted_files() helper functionElijah Newren
2022-06-22merge-ort: split out a separate display_update_messages() functionElijah Newren
2022-06-07Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano
2022-05-20Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano
2022-05-02Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano
2022-04-14revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason
2022-03-17Merge branch 'ab/string-list-count-in-size-t'Junio C Hamano
2022-03-17Merge branch 'ab/object-file-api-updates'Junio C Hamano
2022-03-13Merge branch 'en/merge-ort-align-verbosity-with-recursive'Junio C Hamano
2022-03-07string-list API: change "nr" and "alloc" to "size_t"Ævar Arnfjörð Bjarmason
2022-03-07Merge branch 'en/merge-ort-plug-leaks'Junio C Hamano
2022-03-02merge-ort: exclude messages from inner merges by defaultElijah Newren
2022-02-26object-file API: have write_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason
2022-02-20merge-ort: fix small memory leak in unique_path()Elijah Newren
2022-02-20merge-ort: fix small memory leak in detect_and_process_renames()Elijah Newren
2022-02-17merge-ort: make informational messages from recursive merges clearerElijah Newren
2022-02-16Merge branch 'en/remerge-diff'Junio C Hamano
2022-02-09Merge branch 'en/plug-leaks-in-merge'Junio C Hamano
2022-02-09Merge branch 'en/merge-ort-restart-optim-fix'Junio C Hamano
2022-02-02merge-ort: mark conflict/warning messages from inner merges as omittableElijah Newren
2022-02-02show, log: include conflict/warning messages in --remerge-diff headersElijah Newren
2022-02-02merge-ort: format messages slightly different for use in headersElijah Newren
2022-02-02merge-ort: mark a few more conflict messages as omittableElijah Newren
generated by cgit v0.10.2-6-g49f6 at 2024-05-17 22:56:34 (GMT)