projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Autogenerated HTML docs for v1.3.0-rc3-g170a
[git.git]
/
git-diff-stages.html
diff --git
a/git-diff-stages.html
b/git-diff-stages.html
index
1fd8955
..
aff4b3e
100644
(file)
--- a/
git-diff-stages.html
+++ b/
git-diff-stages.html
@@
-299,6
+299,22
@@
unmerged index file.</p>
</p>
\r
</dd>
\r
<dt>
\r
</p>
\r
</dd>
\r
<dt>
\r
+--patch-with-raw
\r
+</dt>
\r
+<dd>
\r
+<p>
\r
+ Generate patch but keep also the default raw diff output.
\r
+</p>
\r
+</dd>
\r
+<dt>
\r
+--stat
\r
+</dt>
\r
+<dd>
\r
+<p>
\r
+ Generate a diffstat instead of a patch.
\r
+</p>
\r
+</dd>
\r
+<dt>
\r
-z
\r
</dt>
\r
<dd>
\r
-z
\r
</dt>
\r
<dd>
\r
@@
-788,7
+804,7
@@
two unresolved merge parents with the working tree file
</div>
\r
<div id="footer">
\r
<div id="footer-text">
\r
</div>
\r
<div id="footer">
\r
<div id="footer-text">
\r
-Last updated
05-Apr-2006 21:43:19
UTC
\r
+Last updated
15-Apr-2006 06:17:16
UTC
\r
</div>
\r
</div>
\r
</body>
\r
</div>
\r
</div>
\r
</body>
\r