summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-16 21:33:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-16 21:33:43 (GMT)
commit4be33f7222990c1c761cd1c497c0db88b3d376cc (patch)
treec9d77a872a7484b13fa825e47ec7ca0029872190 /Documentation/diff-options.txt
parent335f1a7eb2a08218301deae92244591a0ee9710c (diff)
parent92de92172d1c01f3029d592f7e0f15d52149200b (diff)
downloadgit-4be33f7222990c1c761cd1c497c0db88b3d376cc.zip
git-4be33f7222990c1c761cd1c497c0db88b3d376cc.tar.gz
git-4be33f7222990c1c761cd1c497c0db88b3d376cc.tar.bz2
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
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt11
1 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index b7c3afe..3ad6404 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[]