diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2009-07-29 08:35:21 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2009-07-29 08:35:21 +0000 |
commit | 543f8d61eb235820aecefde6e46ec90e9803a6d8 (patch) | |
tree | 927a67cd988e0c71e5bb57625adf32abcbdbb947 /git-diff-files.html | |
parent | ceec6ab20672c752adf280cfbacca126f01b7411 (diff) | |
download | git-htmldocs-543f8d61eb235820aecefde6e46ec90e9803a6d8.tar.gz |
Autogenerated HTML docs for v1.6.4
Diffstat (limited to 'git-diff-files.html')
-rw-r--r-- | git-diff-files.html | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/git-diff-files.html b/git-diff-files.html index cbc6f0014..78c464453 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -868,9 +868,9 @@ omit diff output for unmerged entries and just show "Unmerged".</p></div> </dd>
</dl></div>
</div>
-<h2 id="_output_format">Output format</h2>
+<h2 id="_raw_output_format">Raw output format</h2>
<div class="sectionbody">
-<div class="para"><p>The output format from "git-diff-index", "git-diff-tree",
+<div class="para"><p>The raw output format from "git-diff-index", "git-diff-tree",
"git-diff-files" and "git diff --raw" are very similar.</p></div>
<div class="para"><p>These commands all compare two sets of things; what is
compared differs:</p></div>
@@ -908,6 +908,9 @@ git-diff-files [<pattern>…] </p>
</dd>
</dl></div>
+<div class="para"><p>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.</p></div>
<div class="para"><p>An output line is formatted this way:</p></div>
<div class="listingblock">
<div class="content">
@@ -1410,7 +1413,7 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p></ </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-07-01 02:30:48 UTC
+Last updated 2009-07-29 08:35:00 UTC
</div>
</div>
</body>
|