Merge branch 'jk/diff-m-doc'

gitster · gitster · commit b0fd34ecd5a3 · 2010-06-13T11:22:27.000-07:00
* jk/diff-m-doc:
  docs: clarify meaning of -M for git-log
diff --git 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`.
