diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2007-11-03 02:46:46 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2007-11-03 02:46:46 +0000 |
commit | 7ae0ab27c80a24b52c6c1bbd3fb8325cb22eb2da (patch) | |
tree | 69639e88a0e700c8a79bf4a0e2bf4436cf2af96f /diff-format.txt | |
parent | 1c70883dc871f015b3f14945f7c310325ab4aba8 (diff) | |
download | git-htmldocs-7ae0ab27c80a24b52c6c1bbd3fb8325cb22eb2da.tar.gz |
Autogenerated HTML docs for v1.5.3.5-529-ge3d6d
Diffstat (limited to 'diff-format.txt')
-rw-r--r-- | diff-format.txt | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/diff-format.txt b/diff-format.txt index 001503205..9709c35c9 100644 --- a/diff-format.txt +++ b/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 |