merge: update documentation for {merge,diff}.renameLimit

diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 5ca942ab5e2d5dfd67ceb06c5991f446b207de90..77caa66c2f768b6e43322c4662f45b4191a163c0 100644 (file)
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -112,7 +112,8 @@ diff.orderFile::
 
 diff.renameLimit::
        The number of files to consider when performing the copy/rename
-       detection; equivalent to the 'git diff' option `-l`.
+       detection; equivalent to the 'git diff' option `-l`. This setting
+       has no effect if rename detection is turned off.
 
 diff.renames::
        Whether and how Git detects renames.  If set to "false",