summaryrefslogtreecommitdiffstats
path: root/git-diff.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-12-29 10:34:22 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-12-29 10:34:22 +0000
commitbbbb865819d5387ef9ee747115b30b5d2dc7e67b (patch)
treec511e4696dcc9826712e7808904299c97d70d250 /git-diff.html
parent2fa431bf8e4db588a1905a08086bc88c5e476bb4 (diff)
downloadgit-htmldocs-bbbb865819d5387ef9ee747115b30b5d2dc7e67b.tar.gz
Autogenerated HTML docs for v1.6.1-28-gc32f76
Diffstat (limited to 'git-diff.html')
-rw-r--r--git-diff.html45
1 files changed, 10 insertions, 35 deletions
diff --git a/git-diff.html b/git-diff.html
index 8474fd83b..9fbb05916 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -415,28 +415,18 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
<dt>
-p
</dt>
-<dd>
-<p>
- Generate patch (see section on generating patches).
- This is the default.
-</p>
-</dd>
<dt>
-u
</dt>
<dd>
<p>
- Synonym for "-p".
+ Generate patch (see section on generating patches).
+ This is the default.
</p>
</dd>
<dt>
-U&lt;n&gt;
</dt>
-<dd>
-<p>
- Shorthand for "--unified=&lt;n&gt;".
-</p>
-</dd>
<dt>
--unified=&lt;n&gt;
</dt>
@@ -764,19 +754,14 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
</p>
</dd>
<dt>
---text
+-a
</dt>
-<dd>
-<p>
- Treat all files as text.
-</p>
-</dd>
<dt>
--a
+--text
</dt>
<dd>
<p>
- Shorthand for "--text".
+ Treat all files as text.
</p>
</dd>
<dt>
@@ -788,6 +773,9 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
</p>
</dd>
<dt>
+-b
+</dt>
+<dt>
--ignore-space-change
</dt>
<dd>
@@ -798,13 +786,8 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
</p>
</dd>
<dt>
--b
+-w
</dt>
-<dd>
-<p>
- Shorthand for "--ignore-space-change".
-</p>
-</dd>
<dt>
--ignore-all-space
</dt>
@@ -816,14 +799,6 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
</p>
</dd>
<dt>
--w
-</dt>
-<dd>
-<p>
- Shorthand for "--ignore-all-space".
-</p>
-</dd>
-<dt>
--exit-code
</dt>
<dd>
@@ -1597,7 +1572,7 @@ Output diff in reverse.
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-12-20 06:29:39 UTC
+Last updated 2008-12-29 10:33:52 UTC
</div>
</div>
</body>