Autogenerated HTML docs for v1.5.3-rc5-15-ga9ab2

diff --git a/git-add.html b/git-add.html
index 807f3cad975ac7c55aa365ec00c1a8c8566476f7..8637be6ab9683bcfcda6e8f1cf11084ab924200c 100644 (file)
--- a/git-add.html
+++ b/git-add.html
@@ -289,10 +289,12 @@ run; if you want subsequent changes included in the next commit, then
 you must run <em>git add</em> again to add the new content to the index.</p>\r
 <p>The <em>git status</em> command can be used to obtain a summary of which\r
 files have changes that are staged for the next commit.</p>\r
-<p>The <em>add</em> command can be used to add ignored files with <tt>-f</tt> (force)\r
-option, but they have to be explicitly and exactly specified from the\r
-command line.  File globbing and recursive behaviour do not add ignored\r
-files.</p>\r
+<p>The <em>git add</em> command will not add ignored files by default.  If any\r
+ignored files were explicitly specified on the command line, <em>git add</em>\r
+will fail with a list of ignored files.  Ignored files reached by\r
+directory recursion or filename globbing will be silently ignored.\r
+The <em>add</em> command can be used to add ignored files with the <tt>-f</tt>\r
+(force) option.</p>\r
 <p>Please see <a href="git-commit.html">git-commit(1)</a> for alternative ways to add content to a\r
 commit.</p>\r
 </div>\r
@@ -566,7 +568,7 @@ diff
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Aug-2007 09:42:24 UTC\r
+Last updated 17-Aug-2007 07:47:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-add.txt b/git-add.txt
index dee38f8250f2a2757155853b246b75029dd303bc..3383aca9aff5bbcfeaaa782736c226cad29b25b7 100644 (file)
--- a/git-add.txt
+++ b/git-add.txt
@@ -28,10 +28,12 @@ you must run 'git add' again to add the new content to the index.
 The 'git status' command can be used to obtain a summary of which
 files have changes that are staged for the next commit.
 
-The 'add' command can be used to add ignored files with `-f` (force)
-option, but they have to be explicitly and exactly specified from the
-command line.  File globbing and recursive behaviour do not add ignored
-files.
+The 'git add' command will not add ignored files by default.  If any
+ignored files were explicitly specified on the command line, 'git add'
+will fail with a list of ignored files.  Ignored files reached by
+directory recursion or filename globbing will be silently ignored.
+The 'add' command can be used to add ignored files with the `-f`
+(force) option.
 
 Please see gitlink:git-commit[1] for alternative ways to add content to a
 commit.

diff --git a/git-rebase.html b/git-rebase.html
index 6a4a262ffa669335b4471c2ed9229488a08c62e4..88f4404f3395e2fd8947d2d33d75ef47284f3016 100644 (file)
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -382,7 +382,7 @@ the following situation:</p>
 <p>then the command</p>\r
 <div class="literalblock">\r
 <div class="content">\r
-<pre><tt>git-rebase --onto topicA~5 topicA~2 topicA</tt></pre>\r
+<pre><tt>git-rebase --onto topicA~5 topicA~3 topicA</tt></pre>\r
 </div></div>\r
 <p>would result in the removal of commits F and G:</p>\r
 <div class="listingblock">\r
@@ -744,7 +744,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:50 UTC\r
+Last updated 17-Aug-2007 07:47:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rebase.txt b/git-rebase.txt
index 96907d48632be36d0d8c66f6a0b4d937b7a38cb6..a1b6dce73d2f2075ef163bf4d6cdea1abc6104ce 100644 (file)
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -130,7 +130,7 @@ the following situation:
 
 then the command
 
-    git-rebase --onto topicA~5 topicA~2 topicA
+    git-rebase --onto topicA~5 topicA~3 topicA
 
 would result in the removal of commits F and G: