diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-06-26 16:20:56 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-06-26 16:20:56 -0700 |
commit | 3a3357e80cfe1646ce4fc7d834b7cb4ee3e65283 (patch) | |
tree | 865a40a2fea0668bf46fd5da7869f79786b9dea4 /git-diff.html | |
parent | 8ab949466f2182c01fb1955cca8b1bba8d2b431a (diff) | |
download | git-htmldocs-3a3357e80cfe1646ce4fc7d834b7cb4ee3e65283.tar.gz |
Autogenerated HTML docs for v1.8.3.1-605-g85318
Diffstat (limited to 'git-diff.html')
-rw-r--r-- | git-diff.html | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/git-diff.html b/git-diff.html index f1f5beab0..11d7ba5da 100644 --- a/git-diff.html +++ b/git-diff.html @@ -759,8 +759,8 @@ git-diff(1) Manual Page <h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>Show changes between the working tree and the index or a tree, changes
-between the index and a tree, changes between two trees, or changes
-between two files on disk.</p></div>
+between the index and a tree, changes between two trees, changes between
+two blob objects, or changes between two files on disk.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
<em>git diff</em> [--options] [--] [<path>…]
@@ -813,15 +813,6 @@ 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>
@@ -854,6 +845,17 @@ However, "diff" is about comparing two <em>endpoints</em>, not ranges, and the range notations ("<commit>..<commit>" and
"<commit>...<commit>") do not mean a range as defined in the
"SPECIFYING RANGES" section in <a href="gitrevisions.html">gitrevisions(7)</a>.</p></div>
+<div class="dlist"><dl>
+<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>
+</dl></div>
</div>
</div>
<div class="sect1">
@@ -2454,7 +2456,7 @@ Output diff in reverse. <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-06-26 16:20:17 PDT
</div>
</div>
</body>
|