summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2010-05-08 00:44:34 -0400
committerJunio C Hamano <gitster@pobox.com>2010-05-18 21:32:41 -0700
commit7ffad2501489690edd9335fdd1e69c05699767e3 (patch)
treed23dcd508bd6354b9d979555973b7b0eccebbdcb /Documentation/diff-options.txt
parent3368edd4cda6306d524e10758e2c5a187dcd4ba6 (diff)
downloadgit-7ffad2501489690edd9335fdd1e69c05699767e3.tar.gz
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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt7
1 files changed, 7 insertions, 0 deletions
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`.