diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-05 18:56:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-05 18:56:55 -0800 |
| commit | 62c666a7034a3aed6792280589bb78205781aa68 (patch) | |
| tree | 941ab0154ef4faf36b63cd725e386c85b072b698 | |
| parent | c67359be45be74e1056d6293c6bb09ee6d00a54a (diff) | |
| parent | 9e6c723087def70d001740db48cf042b77a1d9cd (diff) | |
| download | git-62c666a7034a3aed6792280589bb78205781aa68.tar.gz git-62c666a7034a3aed6792280589bb78205781aa68.tar.xz | |
Merge branch 'gp/maint-diffdoc' into maint
* gp/maint-diffdoc:
git-diff.txt: add section "output format" describing the diff formats
| -rw-r--r-- | Documentation/diff-format.txt | 19 | ||||
| -rw-r--r-- | Documentation/git-diff.txt | 3 |
2 files changed, 13 insertions, 9 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 001503205..9709c35c9 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. These commands all compare two sets of things; what is compared differs: @@ -62,7 +62,8 @@ respectively. 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: @@ -86,10 +87,10 @@ Generating patches with -p -------------------------- 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. @@ -137,8 +138,8 @@ file made it into the new one. 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 --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index db2eb46a1..201d5daf1 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -82,6 +82,9 @@ include::diff-options.txt[] the diff to the named paths (you can give directory names and get diff for all files under them). +Output format +------------- +include::diff-format.txt[] EXAMPLES -------- |