index
:
git
gitk-resize-error
main
Fork of git SCM with my patches.
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
merge-ort.c
Age
Commit message (
Expand
)
Author
2026-01-09
cocci: convert parse_tree functions to repo_ variants
René Scharfe
2026-01-08
Merge branch 'en/ort-recursive-d-f-conflict-fix'
Junio C Hamano
2025-12-30
merge-ort: fix corner case recursive submodule/directory conflict handling
Elijah Newren
2025-11-26
Merge branch 'ad/blame-diff-algorithm'
Junio C Hamano
2025-11-17
merge-ort: fix failing merges in special corner case
Elijah Newren
2025-11-17
merge-ort: remove debugging crud
Elijah Newren
2025-11-17
xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK
Antonin Delpeuch
2025-10-15
Merge branch 'en/ort-rename-fixes' into maint-2.51
Junio C Hamano
2025-08-21
Merge branch 'en/ort-rename-fixes'
Junio C Hamano
2025-08-07
merge-ort: fix directory rename on top of source of other rename/delete
Elijah Newren
2025-08-07
merge-ort: fix incorrect file handling
Elijah Newren
2025-08-07
merge-ort: clarify the interning of strings in opt->priv->path
Elijah Newren
2025-08-07
merge-ort: drop unnecessary temporary in check_for_directory_rename()
Elijah Newren
2025-08-07
merge-ort: update comments to modern testfile location
Elijah Newren
2025-08-05
Merge branch 'ps/object-file-wo-the-repository'
Junio C Hamano
2025-07-23
config: drop `git_config_get_bool()` wrapper
Patrick Steinhardt
2025-07-23
config: drop `git_config_get_int()` wrapper
Patrick Steinhardt
2025-07-23
config: drop `git_config_get_string()` wrapper
Patrick Steinhardt
2025-07-23
config: drop `git_config()` wrapper
Patrick Steinhardt
2025-07-16
odb: introduce `odb_write_object()`
Patrick Steinhardt
2025-07-01
odb: rename `repo_read_object_file()`
Patrick Steinhardt
2025-07-01
odb: rename `oid_object_info()`
Patrick Steinhardt
2025-07-01
object-store: rename files to "odb.{c,h}"
Patrick Steinhardt
2025-05-16
merge-ort: add a new mergeability_only option
Elijah Newren
2025-04-24
Merge branch 'ps/object-file-cleanup'
Junio C Hamano
2025-04-17
Merge branch 'en/merge-recursive-debug'
Junio C Hamano
2025-04-15
Merge branch 'ps/object-wo-the-repository'
Junio C Hamano
2025-04-15
object-file: split out functions relating to object store subsystem
Patrick Steinhardt
2025-04-08
Merge branch 'ps/object-wo-the-repository' into ps/object-file-cleanup
Junio C Hamano
2025-04-08
merge-recursive.[ch]: thoroughly debug these
Elijah Newren
2025-04-08
merge-ort: enable diff-algorithms other than histogram
Elijah Newren
2025-04-08
Merge branch 'en/assert-wo-side-effects'
Junio C Hamano
2025-03-29
Merge branch 'en/random-cleanups'
Junio C Hamano
2025-03-29
Merge branch 'en/merge-ort-prepare-to-remove-recursive'
Junio C Hamano
2025-03-21
treewide: replace assert() with ASSERT() in special cases
Elijah Newren
2025-03-18
merge-ort: fix merge.directoryRenames=false
Elijah Newren
2025-03-18
merge-ort: allow rename detection to be disabled
Elijah Newren
2025-03-18
merge-ort: add new merge_ort_generic() function
Elijah Newren
2025-03-17
merge-ort: remove extraneous word in comment
Elijah Newren
2025-03-17
merge-ort: fix accidental strset<->strintmap
Elijah Newren
2025-03-10
hash: stop depending on `the_repository` in `null_oid()`
Patrick Steinhardt
2025-03-06
merge-ort: fix slightly overzealous assertion for rename-to-self
Elijah Newren
2024-12-06
global: mark code units that generate warnings with `-Wsign-compare`
Patrick Steinhardt
2024-09-30
diff: improve lifecycle management of diff queues
Patrick Steinhardt
2024-09-25
Merge branch 'ak/typofix-2.46-maint'
Junio C Hamano
2024-09-19
merge-ort: fix typos
Andrew Kreimer
2024-09-05
merge-ort: fix two leaks when handling directory rename modifications
Patrick Steinhardt
2024-08-14
merge-ort: unconditionally release attributes index
Patrick Steinhardt
2024-07-16
Merge branch 'en/ort-inner-merge-error-fix'
Junio C Hamano
2024-07-08
Merge branch 'ps/leakfixes-more'
Junio C Hamano
[next]
