From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 29 Mar 2025 07:39:07 +0000 (+0900)
Subject: Merge branch 'en/merge-ort-prepare-to-remove-recursive'
X-Git-Tag: v2.50.0-rc0~168
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb7923be1ff0a81e9ce5849f6a6202a4d9e9d0f2;p=thirdparty%2Fgit.git

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
---

eb7923be1ff0a81e9ce5849f6a6202a4d9e9d0f2