diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-12-21 15:49:12 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-12-21 15:49:12 -0800 |
commit | db81b99382f90c930f2d2a737b4fdf2b7d63a00b (patch) | |
tree | 2f0174096812fd2f2d403afbf13add15952cfa36 /git-diff.html | |
parent | 9d9711544dc3090db6e5c52f9ce9c300bf4f5c14 (diff) | |
download | git-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.html | 15 |
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] [<commit>] [--] [<path>…]
<em>git diff</em> [options] --cached [<commit>] [--] [<path>…]
<em>git diff</em> [options] <commit> <commit> [--] [<path>…]
+<em>git diff</em> [options] <blob> <blob>
<em>git diff</em> [options] [--no-index] [--] <path> <path></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] <blob> <blob>
+</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] <commit>..<commit> [--] [<path>…]
</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 <commit> in the above description, except
in the last two forms that use ".." notations, can be any
-<tree>. The third form (<em>git diff <commit> <commit></em>) can also
-be used to compare two <blob> objects.</p></div>
+<tree>.</p></div>
<div class="paragraph"><p>For a more complete list of ways to spell <commit>, 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>
|