Re: [PATCH] git-diff.txt: add section "output format" describing the diff formats
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:45
Gerrit Pape [off-list ref] writes:
quoted hunk
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 0015032..a580f18 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt@@ -1,5 +1,5 @@ -The output format from "git-diff-index", "git-diff-tree" and -"git-diff-files" are very similar. +The output format from "git-diff-index", "git-diff-tree", +"git-diff-files" and "git diff --raw" are very similar.
I like this attention to the detail of mentioning "--raw".
quoted hunk
@@ -62,9 +62,9 @@ respectively. diff format for merges ---------------------- -"git-diff-tree" and "git-diff-files" can take '-c' or '--cc' option -to generate diff output also for merge commits. The output differs -from the format described above in the following way: +"git-diff-tree", "git-diff-files" and "git-diff" can take '-c' or +'--cc' option to generate diff output also for merge commits. The +output differs from the format described above in the following way:
... and this part should do so, too.