diff options
author | Junio C Hamano <junio@kernel.org> | 2010-10-14 04:37:28 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2010-10-14 04:37:28 +0000 |
commit | c27b733bfcf3bef4722ef8d46334aff3e15e0cd2 (patch) | |
tree | 1a666e343738a0601732529bb7e0dc1be6775f96 /git-diff.html | |
parent | 657fd8a8dd93c9d5c7534016aa6601c564fe2601 (diff) | |
download | git-htmldocs-c27b733bfcf3bef4722ef8d46334aff3e15e0cd2.tar.gz |
Autogenerated HTML docs for v1.7.3.1-120-g38a18
Diffstat (limited to 'git-diff.html')
-rw-r--r-- | git-diff.html | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/git-diff.html b/git-diff.html index 4d3e913b1..dc9ff4a3d 100644 --- a/git-diff.html +++ b/git-diff.html @@ -338,9 +338,9 @@ tree and the index file, or the index file and the working tree.</p></div> further add to the index but you still haven't. You can
stage these changes by using <a href="git-add.html">git-add(1)</a>.
</p>
-<div class="para"><p>If exactly two paths are given, and at least one is untracked,
-compare the two files / directories. This behavior can be
-forced by --no-index.</p></div>
+<div class="para"><p>If exactly two paths are given and at least one points outside
+the current repository, <em>git diff</em> will compare the two files /
+directories. This behavior can be forced by --no-index.</p></div>
</dd>
<dt>
<em>git diff</em> [--options] --cached [<commit>] [--] [<path>…]
@@ -400,14 +400,15 @@ forced by --no-index.</p></div> </dl></div>
<div class="para"><p>Just in case if you are doing something exotic, it should be
noted that all of the <commit> in the above description, except
-for the last two forms that use ".." notations, can be any
-<tree-ish>.</p></div>
+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>
<div class="para"><p>For a more complete list of ways to spell <commit>, see
-"SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(1)</a>.
+"SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(7)</a>.
However, "diff" is about comparing two _endpoints_, 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(1)</a>.</p></div>
+"SPECIFYING RANGES" section in <a href="gitrevisions.html">gitrevisions(7)</a>.</p></div>
</div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
@@ -1722,16 +1723,12 @@ Output diff in reverse. </div>
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
-<a href="git-difftool.html">git-difftool(1)</a>
-</dt>
-<dd>
-<p>
- Show changes using common diff tools
-</p>
-</dd>
-</dl></div>
+<div class="para"><p>diff(1),
+<a href="git-difftool.html">git-difftool(1)</a>,
+<a href="git-log.html">git-log(1)</a>,
+<a href="gitdiffcore.html">gitdiffcore(7)</a>,
+<a href="git-format-patch.html">git-format-patch(1)</a>,
+<a href="git-apply.html">git-apply(1)</a></p></div>
</div>
<h2 id="_author">Author</h2>
<div class="sectionbody">
@@ -1747,7 +1744,7 @@ Output diff in reverse. </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-30 00:02:56 UTC
+Last updated 2010-10-14 04:35:15 UTC
</div>
</div>
</body>
|