summaryrefslogtreecommitdiffstats
path: root/diff-format.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-07-29 08:35:21 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-07-29 08:35:21 +0000
commit543f8d61eb235820aecefde6e46ec90e9803a6d8 (patch)
tree927a67cd988e0c71e5bb57625adf32abcbdbb947 /diff-format.txt
parentceec6ab20672c752adf280cfbacca126f01b7411 (diff)
downloadgit-htmldocs-543f8d61eb235820aecefde6e46ec90e9803a6d8.tar.gz
Autogenerated HTML docs for v1.6.4
Diffstat (limited to 'diff-format.txt')
-rw-r--r--diff-format.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/diff-format.txt b/diff-format.txt
index 1eeb1c768..b71712473 100644
--- a/diff-format.txt
+++ b/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: