summaryrefslogtreecommitdiffstats
path: root/git-diff.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-17 14:34:00 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-17 14:34:00 -0700
commite6f28d0b6c239f15760194c8b12afdaa1a7bdd34 (patch)
treeb782d1e78feb1a9f17131581d754b0e29abaa0b8 /git-diff.html
parent0e0e0d2656a57fd3628bb6dbdaf0096684ed24a9 (diff)
downloadgit-htmldocs-e6f28d0b6c239f15760194c8b12afdaa1a7bdd34.tar.gz
Autogenerated HTML docs for v1.8.4-357-g8d83
Diffstat (limited to 'git-diff.html')
-rw-r--r--git-diff.html18
1 files changed, 14 insertions, 4 deletions
diff --git a/git-diff.html b/git-diff.html
index 42823e1eb..ac9a26949 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -773,9 +773,19 @@ two blob objects, or changes between two files on disk.</p></div>
further add to the index but you still haven&#8217;t. You can
stage these changes by using <a href="git-add.html">git-add(1)</a>.
</p>
-<div class="paragraph"><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 class="hdlist1">
+<em>git diff</em> --no-index [--options] [--] [&lt;path&gt;&#8230;]
+</dt>
+<dd>
+<p>
+ This form is to compare the given two paths on the
+ filesystem. You can omit the <code>--no-index</code> option when
+ running the command in a working tree controlled by Git and
+ at least one of the paths points outside the working tree,
+ or when running the command outside a working tree
+ controlled by Git.
+</p>
</dd>
<dt class="hdlist1">
<em>git diff</em> [--options] --cached [&lt;commit&gt;] [--] [&lt;path&gt;&#8230;]
@@ -2476,7 +2486,7 @@ Output diff in reverse.
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2013-09-17 14:33:14 PDT
</div>
</div>
</body>