summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-01 12:45:17 -0700
committerJunio C Hamano <gitster@pobox.com>2015-06-01 12:45:18 -0700
commitabcbafedbfbd5994ad604bab141c0ba18f5a19df (patch)
tree49b3dda778d5df9f024013c8480f9b4ba0f3db50
parent67f0b6f3b2226ea858c616028375dcc3c46ccc37 (diff)
parent92de92172d1c01f3029d592f7e0f15d52149200b (diff)
downloadgit-abcbafedbfbd5994ad604bab141c0ba18f5a19df.tar.gz
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
-rw-r--r--Documentation/diff-options.txt11
-rw-r--r--Documentation/pretty-formats.txt5
2 files changed, 14 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index b7c3afeb3a..3ad6404dbc 100644
--- 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[]
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index dcf7429a47..dc865cbb27 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -79,7 +79,10 @@ stored in the commit object. Notably, the SHA-1s are
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>'
+