Re: [PATCH 07/10] merge-strategies.txt: explain why no-renames might be useful

On Tue, Aug 3, 2021 at 6:28 PM Junio C Hamano [off-list ref] wrote:

"Elijah Newren via GitGitGadget" [off-list ref] writes:

quoted

From: Elijah Newren <redacted>

Signed-off-by: Elijah Newren <redacted>
---
 Documentation/merge-strategies.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index eb43befac7b..d21dbd1e051 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt

@@ -75,9 +75,10 @@ no-renormalize;;
      `merge.renormalize` configuration variable.

 no-renames;;
-     Turn off rename detection. This overrides the `merge.renames`
-     configuration variable.
-     See also linkgit:git-diff[1] `--no-renames`.
+     Turn off rename detection, which can be computationally
+     expensive.  This overrides the `merge.renames`
+     configuration variable.  See also linkgit:git-diff[1]
+     `--no-renames`.

Other reasons are that we may find a pair that the user did not
intend to when they made the change (i.e. it was done purely a
creation and a deletion but we found similarity), or we may find a
wrong original to consolidate changes from a side branch into, and
these are fundamental as it is our early design choice not to
record renames at the time of committing.

Good points.  Trying to describe all of that makes it somewhat
lengthy; does it make sense to include all of that, or should I just
drop this patch?