diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
commit | fce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch) | |
tree | ffce2ae419b52786a0e567f4fddaadd89016f62c /git-diff.html | |
parent | bb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff) | |
download | git-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz |
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-diff.html')
-rw-r--r-- | git-diff.html | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/git-diff.html b/git-diff.html index e36c307a2..6ccba6cc6 100644 --- a/git-diff.html +++ b/git-diff.html @@ -272,7 +272,7 @@ git-diff(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-diff</em> [<common diff options>] <commit>{0,2} [--] [<path>…]</p>
+<p><em>git diff</em> [<common diff options>] <commit>{0,2} [--] [<path>…]</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -280,7 +280,7 @@ git-diff(1) Manual Page tree and the index file, or the index file and the working tree.</p>
<dl>
<dt>
-<em>git-diff</em> [--options] [--] [<path>…]
+<em>git diff</em> [--options] [--] [<path>…]
</dt>
<dd>
<p>
@@ -295,7 +295,7 @@ compare the two files / directories. This behavior can be forced by --no-index.</p>
</dd>
<dt>
-<em>git-diff</em> [--options] --cached [<commit>] [--] [<path>…]
+<em>git diff</em> [--options] --cached [<commit>] [--] [<path>…]
</dt>
<dd>
<p>
@@ -306,7 +306,7 @@ forced by --no-index.</p> </p>
</dd>
<dt>
-<em>git-diff</em> [--options] <commit> [--] [<path>…]
+<em>git diff</em> [--options] <commit> [--] [<path>…]
</dt>
<dd>
<p>
@@ -318,7 +318,7 @@ forced by --no-index.</p> </p>
</dd>
<dt>
-<em>git-diff</em> [--options] <commit> <commit> [--] [<path>…]
+<em>git diff</em> [--options] <commit> <commit> [--] [<path>…]
</dt>
<dd>
<p>
@@ -327,7 +327,7 @@ forced by --no-index.</p> </p>
</dd>
<dt>
-<em>git-diff</em> [--options] <commit>..<commit> [--] [<path>…]
+<em>git diff</em> [--options] <commit>..<commit> [--] [<path>…]
</dt>
<dd>
<p>
@@ -337,14 +337,14 @@ forced by --no-index.</p> </p>
</dd>
<dt>
-<em>git-diff</em> [--options] <commit>...<commit> [--] [<path>…]
+<em>git diff</em> [--options] <commit>...<commit> [--] [<path>…]
</dt>
<dd>
<p>
This form is to view the changes on the branch containing
and up to the second <commit>, starting at a common ancestor
- of both <commit>. "git-diff A...B" is equivalent to
- "git-diff $(git-merge-base A B) B". You can omit any one
+ of both <commit>. "git diff A...B" is equivalent to
+ "git diff $(git-merge-base A B) B". You can omit any one
of <commit>, which has the same effect as using HEAD instead.
</p>
</dd>
@@ -836,7 +836,7 @@ and the range notations ("<commit>..<commit>" and </dd>
</dl>
<p>For more detailed explanation on these common options, see also
-<a href="gitdiffcore.html">gitdiffcore(7)</a>[diffcore documentation].</p>
+<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p>
<dl>
<dt>
<path>…
@@ -1493,7 +1493,7 @@ Output diff in reverse. </div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 01:33:36 UTC
+Last updated 02-Jul-2008 03:01:41 UTC
</div>
</div>
</body>
|