summaryrefslogtreecommitdiffstats
path: root/git-diff.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-12-05 06:20:48 +0000
committerJunio C Hamano <junio@kernel.org>2010-12-05 06:20:48 +0000
commit2e6ded8990e867c457680899597363f3c1dd07f6 (patch)
treea8b3625c96ffe486511441a9944dfcfe3231bf40 /git-diff.html
parentd3dc64968e5141a389eeb491876e2aab1da90c24 (diff)
downloadgit-htmldocs-2e6ded8990e867c457680899597363f3c1dd07f6.tar.gz
Autogenerated HTML docs for v1.7.3.3-398-g0b0cd
Diffstat (limited to 'git-diff.html')
-rw-r--r--git-diff.html15
1 files changed, 11 insertions, 4 deletions
diff --git a/git-diff.html b/git-diff.html
index d0410c53c..09343f55e 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -414,12 +414,19 @@ git-diff(1) Manual Page
</div>
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
-<div class="paragraph"><p><em>git diff</em> [&lt;common diff options&gt;] &lt;commit&gt;{0,2} [--] [&lt;path&gt;&#8230;]</p></div>
+<div class="verseblock">
+<div class="verseblock-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] [--no-index] [--] &lt;path&gt; &lt;path&gt;</div>
+<div class="verseblock-attribution">
+</div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Show changes between two trees, a tree and the working tree, a
-tree and the index file, or the index file and the working tree.</p></div>
+<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>
<div class="dlist"><dl>
<dt class="hdlist1">
<em>git diff</em> [--options] [--] [&lt;path&gt;&#8230;]
@@ -1868,7 +1875,7 @@ Output diff in reverse.
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-11-06 00:41:57 UTC
+Last updated 2010-12-05 06:20:21 UTC
</div>
</div>
</body>