Merge branch 'jc/unexport-git-pager-in-use-in-pager' into maint

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index b7c3afeb3a0ce871d426de6912a6a875f37620fa..3ad6404dbcf2915721ac963085bbc0269c1d7312 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -43,10 +43,19 @@ endif::git-format-patch[]
 
 ifndef::git-format-patch[]
 --raw::
-       Generate the raw format.
+ifndef::git-log[]
+       Generate the diff in raw format.
 ifdef::git-diff-core[]
        This is the default.
 endif::git-diff-core[]
+endif::git-log[]
+ifdef::git-log[]
+       For each commit, show a summary of changes using the raw diff
+       format. See the "RAW OUTPUT FORMAT" section of
+       linkgit:git-diff[1]. This is different from showing the log
+       itself in raw format, which you can achieve with
+       `--format=raw`.
+endif::git-log[]
 endif::git-format-patch[]
 
 ifndef::git-format-patch[]