summaryrefslogtreecommitdiff
path: root/merge-ort.c
Commit message (Expand)AuthorAgeFilesLines
* 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-07-311-0/+3
| * merge-ort: clean up after failed mergeJohannes Schindelin2022-07-311-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
| * | merge-ort: small cleanups of check_for_directory_renameElijah Newren2022-07-061-6/+6
* | | merge-ort: optionally produce machine-readable outputElijah Newren2022-06-221-2/+20
* | | merge-ort: store more specific conflict informationElijah Newren2022-06-221-55/+212
* | | merge-ort: make `path_messages` a strmap to a string_listJohannes Schindelin2022-06-221-33/+1
* | | merge-ort: store messages in a list, not in a single strbufJohannes Schindelin2022-06-221-43/+80
* | | merge-ort: remove command-line-centric submodule message from merge-ortElijah Newren2022-06-221-8/+1
* | | merge-ort: provide a merge_get_conflicted_files() helper functionElijah Newren2022-06-221-0/+31
* | | merge-ort: split out a separate display_update_messages() functionElijah Newren2022-06-221-37/+41
* | | Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano2022-06-071-0/+1
|\ \ \
| * | | revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason2022-04-131-0/+1
| |/ /
* | | Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano2022-05-201-2/+2
|\ \ \ | |/ / |/| |
| * | Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano2022-05-021-2/+2
| |\ \ | | |/ | |/|
| | * tree-wide: apply equals-null.cocciJunio C Hamano2022-05-021-2/+2
* | | Merge branch 'ab/string-list-count-in-size-t'Junio C Hamano2022-03-161-2/+2
|\ \ \
| * | | string-list API: change "nr" and "alloc" to "size_t"Ævar Arnfjörð Bjarmason2022-03-071-2/+2
* | | | Merge branch 'ab/object-file-api-updates'Junio C Hamano2022-03-161-2/+2
|\ \ \ \
| * | | | object-file API: have write_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason2022-02-251-2/+2
| | |/ / | |/| |
* | | | Merge branch 'en/merge-ort-align-verbosity-with-recursive'Junio C Hamano2022-03-131-2/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | merge-ort: exclude messages from inner merges by defaultElijah Newren2022-03-011-2/+3
* | | | Merge branch 'en/merge-ort-plug-leaks'Junio C Hamano2022-03-061-19/+17
|\ \ \ \ | |/ / / |/| | |
| * | | merge-ort: fix small memory leak in unique_path()Elijah Newren2022-02-201-9/+12
| * | | merge-ort: fix small memory leak in detect_and_process_renames()Elijah Newren2022-02-201-10/+5
* | | | merge-ort: make informational messages from recursive merges clearerElijah Newren2022-02-171-0/+5
|/ / /
* | | Merge branch 'en/remerge-diff'Junio C Hamano2022-02-161-5/+50
|\ \ \
| * | | merge-ort: mark conflict/warning messages from inner merges as omittableElijah Newren2022-02-021-1/+3
| * | | show, log: include conflict/warning messages in --remerge-diff headersElijah Newren2022-02-021-0/+1
| * | | merge-ort: format messages slightly different for use in headersElijah Newren2022-02-021-2/+40
| * | | merge-ort: mark a few more conflict messages as omittableElijah Newren2022-02-021-2/+2
| * | | merge-ort: capture and print ll-merge warnings in our preferred fashionElijah Newren2022-02-021-2/+3
| * | | ll-merge: make callers responsible for showing warningsElijah Newren2022-02-021-1/+4
| | |/ | |/|
* | | Merge branch 'en/plug-leaks-in-merge'Junio C Hamano2022-02-091-5/+5
|\ \ \
| * | | merge-ort: fix memory leak in merge_ort_internal()Elijah Newren2022-01-211-5/+5
| | |/ | |/|
* | | Merge branch 'en/merge-ort-restart-optim-fix'Junio C Hamano2022-02-091-0/+4
|\ \ \ | |/ / |/| |
| * | merge-ort: avoid assuming all renames detectedElijah Newren2022-01-171-0/+4
* | | merge-ort: fix bug with renormalization and rename/delete conflictsElijah Newren2021-12-301-3/+16
| |/ |/|
* | Merge branch 'jt/no-abuse-alternate-odb-for-submodules'Junio C Hamano2021-10-251-14/+4
|\ \
View Lorry Controller Status