diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-03-29 16:39:07 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-03-29 16:39:07 +0900 |
| commit | eb7923be1ff0a81e9ce5849f6a6202a4d9e9d0f2 (patch) | |
| tree | 8e047980a95ba3bd635db1ea0b48ca9351c225c0 /builtin/commit.c | |
| parent | 8d6413a1bef7876b9c17a79358bd70b764ffacba (diff) | |
| parent | 947e219fb6b1acc3d276d0b50ebf411c252a40bd (diff) | |
Merge branch 'en/merge-ort-prepare-to-remove-recursive'
First step of deprecating and removing merge-recursive.
* en/merge-ort-prepare-to-remove-recursive:
am: switch from merge_recursive_generic() to merge_ort_generic()
merge-ort: fix merge.directoryRenames=false
t3650: document bug when directory renames are turned off
merge-ort: support having merge verbosity be set to 0
merge-ort: allow rename detection to be disabled
merge-ort: add new merge_ort_generic() function
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions