Merge branch 'maint'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 0d89aaaf2aac365f78823c05b57b02ecffa95928..e745a3ccdc923b068e791a778a7c73b664b230d2 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -210,7 +210,14 @@ endif::git-format-patch[]
        Break complete rewrite changes into pairs of delete and create.
 
 -M::
+ifndef::git-log[]
        Detect renames.
+endif::git-log[]
+ifdef::git-log[]
+       If generating diffs, detect and report renames for each commit.
+       For following files across renames while traversing history, see
+       `--follow`.
+endif::git-log[]
 
 -C::
        Detect copies as well as renames.  See also `--find-copies-harder`.