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.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
merge-ort.c
Age
Commit message (
Expand
)
Author
2023-03-28
cocci: apply the "promisor-remote.h" part of "the_repository.pending"
Ævar Arnfjörð Bjarmason
2023-03-28
cocci: apply the "object-store.h" part of "the_repository.pending"
Ævar Arnfjörð Bjarmason
2023-03-28
cocci: apply the "commit-reach.h" part of "the_repository.pending"
Ævar Arnfjörð Bjarmason
2022-10-31
Merge branch 'en/ort-dir-rename-and-symlink-fix'
Taylor Blau
2022-10-28
Merge branch 'jk/unused-anno-more'
Junio C Hamano
2022-10-23
merge-ort: fix bug with dir rename vs change dir to symlink
Elijah Newren
2022-10-18
string-list: mark unused callback parameters
Jeff King
2022-09-28
merge-ort: return early when failing to write a blob
Johannes Schindelin
2022-09-28
merge-ort: fix segmentation fault in read-only repositories
Johannes Schindelin
2022-08-30
Merge branch 'en/ort-unused-code-removal'
Junio C Hamano
2022-08-26
Merge branch 'en/submodule-merge-messages-fixes'
Junio C Hamano
2022-08-19
merge-ort: remove code obsoleted by other changes
Elijah Newren
2022-08-18
merge-ort: provide helpful submodule update message when possible
Elijah Newren
2022-08-18
merge-ort: avoid surprise with new sub_flag variable
Elijah Newren
2022-08-18
merge-ort: remove translator lego in new "submodule conflict suggestion"
Elijah Newren
2022-08-08
Merge branch 'js/ort-clean-up-after-failed-merge'
Junio C Hamano
2022-08-04
submodule merge: update conflict error message
Calvin Wan
2022-08-01
merge-ort: do leave trace2 region even if checkout fails
Johannes Schindelin
2022-08-01
merge-ort: clean up after failed merge
Johannes Schindelin
2022-07-18
Merge branch 'en/merge-dual-dir-renames-fix'
Junio C Hamano
2022-07-06
merge-ort: fix issue with dual rename and add/add conflict
Elijah Newren
2022-07-06
merge-ort: shuffle the computation and cleanup of potential collisions
Elijah Newren
2022-07-06
merge-ort: make a separate function for freeing struct collisions
Elijah Newren
2022-07-06
merge-ort: small cleanups of check_for_directory_rename
Elijah Newren
2022-06-23
merge-ort: optionally produce machine-readable output
Elijah Newren
2022-06-23
merge-ort: store more specific conflict information
Elijah Newren
2022-06-23
merge-ort: make `path_messages` a strmap to a string_list
Johannes Schindelin
2022-06-23
merge-ort: store messages in a list, not in a single strbuf
Johannes Schindelin
2022-06-23
merge-ort: remove command-line-centric submodule message from merge-ort
Elijah Newren
2022-06-23
merge-ort: provide a merge_get_conflicted_files() helper function
Elijah Newren
2022-06-23
merge-ort: split out a separate display_update_messages() function
Elijah Newren
2022-06-08
Merge branch 'ab/plug-leak-in-revisions'
Junio C Hamano
2022-05-21
Merge branch 'ep/maint-equals-null-cocci'
Junio C Hamano
2022-05-02
Merge branch 'ep/maint-equals-null-cocci' for maint-2.35
Junio C Hamano
2022-05-02
tree-wide: apply equals-null.cocci
Junio C Hamano
2022-04-14
revisions API users: add straightforward release_revisions()
Ævar Arnfjörð Bjarmason
2022-03-17
Merge branch 'ab/string-list-count-in-size-t'
Junio C Hamano
2022-03-17
Merge branch 'ab/object-file-api-updates'
Junio C Hamano
2022-03-14
Merge branch 'en/merge-ort-align-verbosity-with-recursive'
Junio C Hamano
2022-03-07
string-list API: change "nr" and "alloc" to "size_t"
Ævar Arnfjörð Bjarmason
2022-03-07
Merge branch 'en/merge-ort-plug-leaks'
Junio C Hamano
2022-03-02
merge-ort: exclude messages from inner merges by default
Elijah Newren
2022-02-26
object-file API: have write_object_file() take "enum object_type"
Ævar Arnfjörð Bjarmason
2022-02-20
merge-ort: fix small memory leak in unique_path()
Elijah Newren
2022-02-20
merge-ort: fix small memory leak in detect_and_process_renames()
Elijah Newren
2022-02-18
merge-ort: make informational messages from recursive merges clearer
Elijah Newren
2022-02-17
Merge branch 'en/remerge-diff'
Junio C Hamano
2022-02-10
Merge branch 'en/plug-leaks-in-merge'
Junio C Hamano
2022-02-10
Merge branch 'en/merge-ort-restart-optim-fix'
Junio C Hamano
2022-02-02
merge-ort: mark conflict/warning messages from inner merges as omittable
Elijah Newren
[next]