Merge branch 'cf/submodule-progress-dissociate'

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 48ee3bce77c28ed5137f9345fd9376f5f43b1bf1..662c2713cab4b9762dded702897d9e92ee0a0549 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -38,6 +38,11 @@ merge.renameLimit::
        diff.renameLimit. This setting has no effect if rename detection
        is turned off.
 
+merge.renames::
+       Whether and how Git detects renames.  If set to "false",
+       rename detection is disabled. If set to "true", basic rename
+       detection is enabled.  Defaults to the value of diff.renames.
+
 merge.renormalize::
        Tell Git that canonical representation of files in the
        repository has changed over time (e.g. earlier commits record