diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-21 13:47:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-21 13:47:02 -0700 |
| commit | d1123cd8103b238da624e0d09655df853799bb38 (patch) | |
| tree | 681cd06e21feab70f21c608c8b7ea686cd6253d5 /builtin/commit.c | |
| parent | Merge branch 'ua/t1517-short-help-tests' (diff) | |
| parent | merge-ort: fix directory rename on top of source of other rename/delete (diff) | |
| download | git-d1123cd8103b238da624e0d09655df853799bb38.tar.gz git-d1123cd8103b238da624e0d09655df853799bb38.zip | |
Merge branch 'en/ort-rename-fixes'
Various bugs about rename handling in "ort" merge strategy have
been fixed.
* en/ort-rename-fixes:
merge-ort: fix directory rename on top of source of other rename/delete
merge-ort: fix incorrect file handling
merge-ort: clarify the interning of strings in opt->priv->path
t6423: fix missed staging of file in testcases 12i,12j,12k
t6423: document two bugs with rename-to-self testcases
merge-ort: drop unnecessary temporary in check_for_directory_rename()
merge-ort: update comments to modern testfile location
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions