summaryrefslogtreecommitdiff
path: root/Documentation/diff-format.txt
diff options
context:
space:
mode:
authorDavid Kågedal <davidk@lysator.liu.se>2009-07-28 08:32:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-07-28 20:32:59 (GMT)
commitf552e51ef9d376c17fa707b7af9582108f4ec81c (patch)
treee0c0c616821f3b9cf7c3fa2d288b3ca654943f95 /Documentation/diff-format.txt
parent02944cc4929c6a7438dbde9216f9ebb193f1ae81 (diff)
downloadgit-f552e51ef9d376c17fa707b7af9582108f4ec81c.zip
git-f552e51ef9d376c17fa707b7af9582108f4ec81c.tar.gz
git-f552e51ef9d376c17fa707b7af9582108f4ec81c.tar.bz2
Update the documentation of the raw diff output format
This includes mentioning the initial hash output of diff-tree, and changes the header to "raw output format" which is more descriptive. Signed-off-by: David Kågedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-format.txt')
-rw-r--r--Documentation/diff-format.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 1eeb1c7..b717124 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -1,4 +1,7 @@
-The output format from "git-diff-index", "git-diff-tree",
+Raw output format
+-----------------
+
+The raw 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
@@ -16,6 +19,9 @@ git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]::
git-diff-files [<pattern>...]::
compares the index and the files on the filesystem.
+The "git-diff-tree" command begins its ouput by printing the hash of
+what is being compared. After that, all the commands print one output
+line per changed file.
An output line is formatted this way: