summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-21 05:40:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-21 05:40:57 -0700
commit7a0d54facd476a9197f405d2cc65d4bc73e3f1a6 (patch)
treeebd6668f5febd5351059a778b6544539a4177162
parentMerge branch 'jn/maint-doc-ignore' into maint (diff)
parentdocs: clarify meaning of -M for git-log (diff)
downloadtgif-7a0d54facd476a9197f405d2cc65d4bc73e3f1a6.tar.xz
Merge branch 'jk/diff-m-doc' into maint
* jk/diff-m-doc: docs: clarify meaning of -M for git-log
-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`.