Merge branch 'mm/log-format-raw-doc'

Clarify that "log --raw" and "log --format=raw" are unrelated
concepts.

* mm/log-format-raw-doc:
  Documentation/log: clarify sha1 non-abbreviation in log --raw
  Documentation/log: clarify what --raw means

diff --cc Documentation/diff-options.txt
index b7c3afeb3a0ce871d426de6912a6a875f37620fa,5e726e1e77e24bb03fc943b7469ebf56cd8582c1..3ad6404dbcf2915721ac963085bbc0269c1d7312
--- 1/Documentation/diff-options.txt
--- 2/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -43,10 -41,17 +43,19 @@@ endif::git-format-patch[
  
  ifndef::git-format-patch[]
  --raw::
-       Generate the raw format.
+ ifndef::git-log[]
+       Generate the diff in raw format.
 -      {git-diff-core? This is the default.}
 +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[]

diff --cc Documentation/pretty-formats.txt
Simple merge