Autogenerated HTML docs for v1.5.3-rc3-91-g5c75

diff --git a/git-diff.html b/git-diff.html
index 8dc5c68..f64ce2c 100644 (file)
--- a/git-diff.html
+++ b/git-diff.html
@@ -833,7 +833,7 @@ Limiting the diff output
 <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 --name-status                <b>(2)</b>\r
 $ git diff arch/i386 include/asm-i386   <b>(3)</b></tt></pre>\r
 </div></div>\r
 <ol>\r
@@ -846,10 +846,7 @@ nor deletion.
 <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 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
+diff output.\r
 </p>\r
 </li>\r
 <li>\r
@@ -898,7 +895,7 @@ output diff in reverse.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 27-Jul-2007 07:25:25 UTC\r
+Last updated 30-Jul-2007 09:06:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.txt b/git-diff.txt
index 639b969..b1f5e7f 100644 (file)
--- a/git-diff.txt
+++ b/git-diff.txt
@@ -102,17 +102,14 @@ Limiting the diff output::
 +
 ------------
 $ git diff --diff-filter=MRC            <1>
-$ git diff --name-status -r             <2>
+$ git diff --name-status                <2>
 $ git diff arch/i386 include/asm-i386   <3>
 ------------
 +
 <1> show only modification, rename and copy, but not addition
 nor deletion.
 <2> show only names and the nature of change, but not actual
-diff output.  --name-status disables usual patch generation
-which in turn also disables recursive behavior, so without -r
-you would only see the directory name if there is a change in a
-file in a subdirectory.
+diff output.
 <3> limit diff output to named subtrees.
 
 Munging the diff output::

diff --git a/gitattributes.html b/gitattributes.html
index 6e0a9e1..1a093eb 100644 (file)
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -675,7 +675,7 @@ Then it examines <tt>.gitattributes</tt> (which is in the parent
 </li>\r
 <li>\r
 <p>\r
-Finally it examines <tt>$GIT_DIR/info/gitattributes</tt>.  This file\r
+Finally it examines <tt>$GIT_DIR/info/attributes</tt>.  This file\r
    is used to override the in-tree settings.  The first line is\r
    a match, and <tt>foo</tt> is set, <tt>bar</tt> is reverted to unspecified\r
    state, and <tt>baz</tt> is unset.\r
@@ -698,7 +698,7 @@ frotz   unspecified</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:10:00 UTC\r
+Last updated 30-Jul-2007 09:06:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gitattributes.txt b/gitattributes.txt
index 810df07..8b90a5b 100644 (file)
--- a/gitattributes.txt
+++ b/gitattributes.txt
@@ -405,7 +405,7 @@ the attributes given to path `t/abc` are computed as follows:
    and `bar` attributes should be given to this path, so it
    leaves `foo` and `bar` unset.  Attribute `baz` is set.
 
-3. Finally it examines `$GIT_DIR/info/gitattributes`.  This file
+3. Finally it examines `$GIT_DIR/info/attributes`.  This file
    is used to override the in-tree settings.  The first line is
    a match, and `foo` is set, `bar` is reverted to unspecified
    state, and `baz` is unset.