Autogenerated HTML docs for v1.4.0-rc1-g99b41

[git.git] / git-diff.html

diff --git a/git-diff.html b/git-diff.html
index c274f0c..6a4b175 100644 (file)
--- a/git-diff.html
+++ b/git-diff.html
@@ -336,16 +336,29 @@ Various ways to check your working tree
 <dd>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>$ git diff <b>(1)</b>\r
-$ git diff --cached <b>(2)</b>\r
-$ git diff HEAD <b>(3)</b>\r
-\r
-<b>(1)</b> changes in the working tree since your last git-update-index.\r
-<b>(2)</b> changes between the index and your last commit; what you\r
-would be committing if you run "git commit" without "-a" option.\r
-<b>(3)</b> changes in the working tree since your last commit; what you\r
-would be committing if you run "git commit -a"</tt></pre>\r
+<pre><tt>$ git diff            <b>(1)</b>\r
+$ git diff --cached   <b>(2)</b>\r
+$ git diff HEAD       <b>(3)</b></tt></pre>\r
 </div></div>\r
+<ol>\r
+<li>\r
+<p>\r
+changes in the working tree since your last git-update-index.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+changes between the index and your last commit; what you\r
+would be committing if you run "git commit" without "-a" option.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+changes in the working tree since your last commit; what you\r
+would be committing if you run "git commit -a"\r
+</p>\r
+</li>\r
+</ol>\r
 </dd>\r
 <dt>\r
 Comparing with arbitrary commits\r
@@ -353,17 +366,30 @@ Comparing with arbitrary commits
 <dd>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>$ git diff test <b>(1)</b>\r
-$ git diff HEAD -- ./test <b>(2)</b>\r
-$ git diff HEAD^ HEAD <b>(3)</b>\r
-\r
-<b>(1)</b> instead of using the tip of the current branch, compare with the\r
+<pre><tt>$ git diff test            <b>(1)</b>\r
+$ git diff HEAD -- ./test  <b>(2)</b>\r
+$ git diff HEAD^ HEAD      <b>(3)</b></tt></pre>\r
+</div></div>\r
+<ol>\r
+<li>\r
+<p>\r
+instead of using the tip of the current branch, compare with the\r
 tip of "test" branch.\r
-<b>(2)</b> instead of comparing with the tip of "test" branch, compare with\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+instead of comparing with the tip of "test" branch, compare with\r
 the tip of the current branch, but limit the comparison to the\r
 file "test".\r
-<b>(3)</b> compare the version before the last commit and the last commit.</tt></pre>\r
-</div></div>\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+compare the version before the last commit and the last commit.\r
+</p>\r
+</li>\r
+</ol>\r
 </dd>\r
 <dt>\r
 Limiting the diff output\r
@@ -371,19 +397,32 @@ Limiting the diff output
 <dd>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>$ git diff --diff-filter=MRC <b>(1)</b>\r
-$ git diff --name-status -r <b>(2)</b>\r
-$ git diff arch/i386 include/asm-i386 <b>(3)</b>\r
-\r
-<b>(1)</b> show only modification, rename and copy, but not addition\r
+<pre><tt>$ git diff --diff-filter=MRC            <b>(1)</b>\r
+$ git diff --name-status -r             <b>(2)</b>\r
+$ git diff arch/i386 include/asm-i386   <b>(3)</b></tt></pre>\r
+</div></div>\r
+<ol>\r
+<li>\r
+<p>\r
+show only modification, rename and copy, but not addition\r
 nor deletion.\r
-<b>(2)</b> show only names and the nature of change, but not actual\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+show only names and the nature of change, but not actual\r
 diff output.  --name-status disables usual patch generation\r
-which in turn also disables recursive behaviour, so without -r\r
+which in turn also disables recursive behavior, so without -r\r
 you would only see the directory name if there is a change in a\r
 file in a subdirectory.\r
-<b>(3)</b> limit diff output to named subtrees.</tt></pre>\r
-</div></div>\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+limit diff output to named subtrees.\r
+</p>\r
+</li>\r
+</ol>\r
 </dd>\r
 <dt>\r
 Munging the diff output\r
@@ -391,13 +430,22 @@ Munging the diff output
 <dd>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>$ git diff --find-copies-harder -B -C <b>(1)</b>\r
-$ git diff -R <b>(2)</b>\r
-\r
-<b>(1)</b> spend extra cycles to find renames, copies and complete\r
-rewrites (very expensive).\r
-<b>(2)</b> output diff in reverse.</tt></pre>\r
+<pre><tt>$ git diff --find-copies-harder -B -C  <b>(1)</b>\r
+$ git diff -R                          <b>(2)</b></tt></pre>\r
 </div></div>\r
+<ol>\r
+<li>\r
+<p>\r
+spend extra cycles to find renames, copies and complete\r
+rewrites (very expensive).\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+output diff in reverse.\r
+</p>\r
+</li>\r
+</ol>\r
 </dd>\r
 </dl>\r
 </div>\r
@@ -415,7 +463,7 @@ rewrites (very expensive).
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Mar-2006 00:31:25 UTC\r
+Last updated 04-Jun-2006 07:24:26 UTC\r
 </div>\r
 </div>\r
 </body>\r