From d89df367f61e8da1ae05ef7054bab4343eb67cdf Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Mon, 18 May 2015 19:55:57 +0200 Subject: [PATCH 1/2] Documentation/log: clarify what --raw means There are several "raw formats", and describing --raw as "Generate the raw format" in the documentation for git-log seems to imply that it generates the raw *log* format. Clarify the wording by saying "raw diff format" explicitly, and make a special-case for "git log": "git log --raw" does not just change the format, it shows something which is not shown by default. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- Documentation/diff-options.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 6cb083aae5..5e726e1e77 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -41,8 +41,17 @@ 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.} +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[] From 92de92172d1c01f3029d592f7e0f15d52149200b Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Mon, 18 May 2015 19:55:58 +0200 Subject: [PATCH 2/2] Documentation/log: clarify sha1 non-abbreviation in log --raw Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- Documentation/pretty-formats.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 85d63532a3..2393f17efc 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:' +