Merge branch 'jk/diff-m-doc' into maint

* jk/diff-m-doc: docs: clarify meaning of -M for git-log
git-mirror · Jun 21, 2010 · 7a0d54f · 7a0d54f
2 parents b178478 + 7ffad25
commit 7a0d54f
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
@@ -177,7 +177,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`.