From: Elijah Newren via GitGitGadget Date: Tue, 03 Aug 2021 15:35:17 GMT Subject: [PATCH 07/10] merge-strategies.txt: explain why no-renames might be useful Message-ID: <7eecf879d608d8be17d4aa0ae087fb610156019c.1628004920.git.gitgitgadget@gmail.com> In-Reply-To: From: Elijah Newren Signed-off-by: Elijah Newren --- 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`. find-renames[=];; Turn on rename detection, optionally setting the similarity -- gitgitgadget