merge-recursive: option to disable renames

[thirdparty/git.git] / Documentation / merge-strategies.txt

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 7bbd19b30032ca76966cbcf44a0b5b738c8f5ced..1a5e1974a559a685f3231ff29c926c799ebcc1bf 100644 (file)
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -81,8 +81,14 @@ no-renormalize;;
        Disables the `renormalize` option.  This overrides the
        `merge.renormalize` configuration variable.
 
+no-renames;;
+       Turn off rename detection.
+       See also linkgit:git-diff[1] `--no-renames`.
+
 rename-threshold=<n>;;
        Controls the similarity threshold used for rename detection.
+       Re-enables rename detection if disabled by a preceding
+       `no-renames`.
        See also linkgit:git-diff[1] `-M`.
 
 subtree[=<path>];;