summaryrefslogtreecommitdiffstats
path: root/git-diff.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-12-21 15:49:12 -0800
committerJunio C Hamano <gitster@pobox.com>2012-12-21 15:49:12 -0800
commitdb81b99382f90c930f2d2a737b4fdf2b7d63a00b (patch)
tree2f0174096812fd2f2d403afbf13add15952cfa36 /git-diff.html
parent9d9711544dc3090db6e5c52f9ce9c300bf4f5c14 (diff)
downloadgit-htmldocs-db81b99382f90c930f2d2a737b4fdf2b7d63a00b.tar.gz
Autogenerated HTML docs for v1.8.1-rc2-38-gb10c4
Diffstat (limited to 'git-diff.html')
-rw-r--r--git-diff.html15
1 files changed, 12 insertions, 3 deletions
diff --git a/git-diff.html b/git-diff.html
index 85a0f1a3f..54f172432 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -749,6 +749,7 @@ git-diff(1) Manual Page
<pre class="content"><em>git diff</em> [options] [&lt;commit&gt;] [--] [&lt;path&gt;&#8230;]
<em>git diff</em> [options] --cached [&lt;commit&gt;] [--] [&lt;path&gt;&#8230;]
<em>git diff</em> [options] &lt;commit&gt; &lt;commit&gt; [--] [&lt;path&gt;&#8230;]
+<em>git diff</em> [options] &lt;blob&gt; &lt;blob&gt;
<em>git diff</em> [options] [--no-index] [--] &lt;path&gt; &lt;path&gt;</pre>
<div class="attribution">
</div></div>
@@ -812,6 +813,15 @@ directories. This behavior can be forced by --no-index.</p></div>
</p>
</dd>
<dt class="hdlist1">
+<em>git diff</em> [options] &lt;blob&gt; &lt;blob&gt;
+</dt>
+<dd>
+<p>
+ This form is to view the differences between the raw
+ contents of two blob objects.
+</p>
+</dd>
+<dt class="hdlist1">
<em>git diff</em> [--options] &lt;commit&gt;..&lt;commit&gt; [--] [&lt;path&gt;&#8230;]
</dt>
<dd>
@@ -837,8 +847,7 @@ directories. This behavior can be forced by --no-index.</p></div>
<div class="paragraph"><p>Just in case if you are doing something exotic, it should be
noted that all of the &lt;commit&gt; in the above description, except
in the last two forms that use ".." notations, can be any
-&lt;tree&gt;. The third form (<em>git diff &lt;commit&gt; &lt;commit&gt;</em>) can also
-be used to compare two &lt;blob&gt; objects.</p></div>
+&lt;tree&gt;.</p></div>
<div class="paragraph"><p>For a more complete list of ways to spell &lt;commit&gt;, see
"SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(7)</a>.
However, "diff" is about comparing two <em>endpoints</em>, not ranges,
@@ -2377,7 +2386,7 @@ Output diff in reverse.
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PST
+Last updated 2012-12-21 15:43:33 PST
</div>
</div>
</body>