Merge branch 'maint'

[git.git] / Documentation / diff-format.txt

diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 18d49d2c3baa81983b19a938598eb091fb7809ef..9709c35c98bc678d1f2e339c8e2d4bbcd7e6231f 100644 (file)
--- 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.

 
 These commands all compare two sets of things; what is
 compared differs:
 
 These commands all compare two sets of things; what is
 compared differs:


@@ -62,7 +62,8 @@ respectively.
 diff format for merges
 ----------------------
 
 diff format for merges
 ----------------------
 

-"git-diff-tree" and "git-diff-files" can take '-c' or '--cc' option
+"git-diff-tree", "git-diff-files" and "git-diff --raw"
+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:
 
 to generate diff output also for merge commits.  The output differs
 from the format described above in the following way:
 


@@ -86,10 +87,10 @@ Generating patches with -p
 --------------------------
 
 When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
 --------------------------
 
 When "git-diff-index", "git-diff-tree", or "git-diff-files" are run

-with a '-p' option, they do not produce the output described above;
-instead they produce a patch file.  You can customize the creation
-of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS
-environment variables.
+with a '-p' option, or "git diff" without the '--raw' option, they
+do not produce the output described above; instead they produce a
+patch file.  You can customize the creation of such patches via the
+GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.

 
 What the -p option produces is slightly different from the traditional
 diff format.
 
 What the -p option produces is slightly different from the traditional
 diff format.


@@ -126,12 +127,19 @@ the file that rename/copy produces, respectively.
     If there is need for such substitution then the whole
     pathname is put in double quotes.
 
     If there is need for such substitution then the whole
     pathname is put in double quotes.
 

+The similarity index is the percentage of unchanged lines, and
+the dissimilarity index is the percentage of changed lines.  It
+is a rounded down integer, followed by a percent sign.  The
+similarity index value of 100% is thus reserved for two equal
+files, while 100% dissimilarity means that no line from the old
+file made it into the new one.
+

 
 combined diff format
 --------------------
 
 
 combined diff format
 --------------------
 

-git-diff-tree and git-diff-files can take '-c' or '--cc' option
-to produce 'combined diff', which looks like this:
+"git-diff-tree", "git-diff-files" and "git-diff" can take '-c' or
+'--cc' option to produce 'combined diff', which looks like this:

 
 ------------
 diff --combined describe.c
 
 ------------
 diff --combined describe.c