From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Jun 2015 21:33:42 +0000 (-0700)
Subject: Merge branch 'mm/log-format-raw-doc' into maint
X-Git-Tag: v2.4.4~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4be33f7222990c1c761cd1c497c0db88b3d376cc?hp=--cc

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

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
---

4be33f7222990c1c761cd1c497c0db88b3d376cc
diff --cc Documentation/diff-options.txt
index b7c3afeb3a,5e726e1e77..3ad6404dbc
--- a/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[]