Merge branch 'da/user-useconfigonly' into HEAD

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 1a5e1974a559a685f3231ff29c926c799ebcc1bf..2eb92b93274df9fb5002336114654fe869903808 100644 (file)
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -85,11 +85,13 @@ no-renames;;
        Turn off rename detection.
        See also linkgit:git-diff[1] `--no-renames`.
 
+find-renames[=<n>];;
+       Turn on rename detection, optionally setting the similarity
+       threshold.  This is the default.
+       See also linkgit:git-diff[1] `--find-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`.
+       Deprecated synonym for `find-renames=<n>`.
 
 subtree[=<path>];;
        This option is a more advanced form of 'subtree' strategy, where