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?ds=inline;hp=-c

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 --combined Documentation/diff-options.txt
index b7c3afeb3a,5e726e1e77..3ad6404dbc
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -23,9 -23,7 +23,9 @@@ ifndef::git-format-patch[
  -u::
  --patch::
  	Generate patch (see section on generating patches).
 -	{git-diff? This is the default.}
 +ifdef::git-diff[]
 +	This is the default.
 +endif::git-diff[]
  endif::git-format-patch[]
  
  -s::
@@@ -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[]
@@@ -436,8 -441,8 +445,8 @@@ endif::git-format-patch[
  -O<orderfile>::
  	Output the patch in the order specified in the
  	<orderfile>, which has one shell glob pattern per line.
 -	This overrides the `diff.orderfile` configuration variable
 -	(see linkgit:git-config[1]).  To cancel `diff.orderfile`,
 +	This overrides the `diff.orderFile` configuration variable
 +	(see linkgit:git-config[1]).  To cancel `diff.orderFile`,
  	use `-O/dev/null`.
  
  ifndef::git-format-patch[]
diff --combined Documentation/pretty-formats.txt
index dcf7429a47,2393f17efc..dc865cbb27
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@@ -79,7 -79,10 +79,10 @@@ stored in the commit object.  Notably, 
  displayed in full, regardless of whether --abbrev or
  --no-abbrev are used, and 'parents' information show the
  true parent commits, without taking grafts or history
- simplification into account.
+ simplification into account. Note that this format affects the way
+ commits are displayed, but not the way the diff is shown e.g. with
+ `git log --raw`. To get full object names in a raw diff format,
+ use `--no-abbrev`.
  
  * 'format:<string>'
  +
@@@ -95,7 -98,7 +98,7 @@@ would show something like this
  The author of fe6e0ee was Junio C Hamano, 23 hours ago
  The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<
  
 ---------
 +-------
  +
  The placeholders are:
  
@@@ -115,22 -118,19 +118,22 @@@
  - '%aD': author date, RFC2822 style
  - '%ar': author date, relative
  - '%at': author date, UNIX timestamp
 -- '%ai': author date, ISO 8601 format
 +- '%ai': author date, ISO 8601-like format
 +- '%aI': author date, strict ISO 8601 format
  - '%cn': committer name
  - '%cN': committer name (respecting .mailmap, see
    linkgit:git-shortlog[1] or linkgit:git-blame[1])
  - '%ce': committer email
  - '%cE': committer email (respecting .mailmap, see
    linkgit:git-shortlog[1] or linkgit:git-blame[1])
 -- '%cd': committer date
 +- '%cd': committer date (format respects --date= option)
  - '%cD': committer date, RFC2822 style
  - '%cr': committer date, relative
  - '%ct': committer date, UNIX timestamp
 -- '%ci': committer date, ISO 8601 format
 +- '%ci': committer date, ISO 8601-like format
 +- '%cI': committer date, strict ISO 8601 format
  - '%d': ref names, like the --decorate option of linkgit:git-log[1]
 +- '%D': ref names without the " (", ")" wrapping.
  - '%e': encoding
  - '%s': subject
  - '%f': sanitized subject line, suitable for a filename
@@@ -185,9 -185,8 +188,9 @@@
  NOTE: Some placeholders may depend on other options given to the
  revision traversal engine. For example, the `%g*` reflog options will
  insert an empty string unless we are traversing reflog entries (e.g., by
 -`git log -g`). The `%d` placeholder will use the "short" decoration
 -format if `--decorate` was not already provided on the command line.
 +`git log -g`). The `%d` and `%D` placeholders will use the "short"
 +decoration format if `--decorate` was not already provided on the command
 +line.
  
  If you add a `+` (plus sign) after '%' of a placeholder, a line-feed
  is inserted immediately before the expansion if and only if the