From 7ffad2501489690edd9335fdd1e69c05699767e3 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sat, 8 May 2010 00:44:34 -0400 Subject: [PATCH] docs: clarify meaning of -M for git-log As an option to the "diff" family, it is fairly obvious what "detect renames" means. However, for revision traversal, the "-M" option is just included in the long list of options, with no indication that it is about showing renames in diffs versus following renames. Let's make it more explicit. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/diff-options.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index c9c6c2b1cb..3070dddfe2 100644 --- 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`.