Autogenerated HTML docs for v1.5.6-rc3

diff --git a/RelNotes-1.5.6.txt b/RelNotes-1.5.6.txt
index ac4881e19a155f7cbb661ed715f969df63189664..0d2608c880c245d5d755f3beddb64d987062b912 100644 (file)
--- a/RelNotes-1.5.6.txt
+++ b/RelNotes-1.5.6.txt
@@ -111,6 +111,6 @@ this release, unless otherwise noted.
 
 --
 exec >/var/tmp/1
-O=v1.5.6-rc1
+O=v1.5.6-rc3
 echo O=`git describe refs/heads/master`
 git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint

diff --git a/git-add.html b/git-add.html
index 6b7be87af06aec17bc937d7a4c05912e6fdd56ce..0e7b67808066ce74849e7003899b6dcf288f53d6 100644 (file)
--- a/git-add.html
+++ b/git-add.html
@@ -273,8 +273,9 @@ git-add(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-add</em> [-n] [-v] [-f] [--interactive | -i] [--patch | -p] [-u] [--refresh]\r
-          [--ignore-errors] [--] &lt;filepattern&gt;&#8230;</div></div>\r
+<div class="content"><em>git-add</em> [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]\r
+          [--update | -u] [--refresh] [--ignore-errors] [--]\r
+          &lt;filepattern&gt;&#8230;</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -340,6 +341,9 @@ commit.</p>
 <dt>\r
 -f\r
 </dt>\r
+<dt>\r
+--force\r
+</dt>\r
 <dd>\r
 <p>\r
         Allow adding otherwise ignored files.\r
@@ -375,6 +379,9 @@ commit.</p>
 <dt>\r
 -u\r
 </dt>\r
+<dt>\r
+--update\r
+</dt>\r
 <dd>\r
 <p>\r
         Update only files that git already knows about, staging modified\r
@@ -616,7 +623,7 @@ double-quote and control characters will still have problems.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2008 22:46:16 UTC\r
+Last updated 15-Jun-2008 05:10:05 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-add.txt b/git-add.txt
index 9c6b081e6c09bc105aae0b447260792fecd175d8..b8e3fa67598037bc5d0de30818b977048bbada72 100644 (file)
--- a/git-add.txt
+++ b/git-add.txt
@@ -8,8 +8,9 @@ git-add - Add file contents to the index
 SYNOPSIS
 --------
 [verse]
-'git-add' [-n] [-v] [-f] [--interactive | -i] [--patch | -p] [-u] [--refresh]
-         [--ignore-errors] [--] <filepattern>...
+'git-add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
+         [--update | -u] [--refresh] [--ignore-errors] [--]
+         <filepattern>...
 
 DESCRIPTION
 -----------
@@ -59,6 +60,7 @@ OPTIONS
         Be verbose.
 
 -f::
+--force::
        Allow adding otherwise ignored files.
 
 -i::
@@ -75,6 +77,7 @@ OPTIONS
        the specified filepatterns before exiting.
 
 -u::
+--update::
        Update only files that git already knows about, staging modified
        content for commit and marking deleted files for removal. This
        is similar

diff --git a/git-bisect.html b/git-bisect.html
index 597bc42bed3390396b2afd86240c5c73eb630f5d..5d8309af841db8b5d3078c410da4d3ee5bf2ffea 100644 (file)
--- a/git-bisect.html
+++ b/git-bisect.html
@@ -335,10 +335,9 @@ bad kernel rev in "refs/bisect/bad".</p>
 <div class="content">\r
 <pre><tt>$ git bisect reset</tt></pre>\r
 </div></div>\r
-<p>to get back to the original branch, instead of being in one of the\r
-bisection branches ("git bisect start" will do that for you too,\r
-actually: it will reset the bisection state, and before it does that\r
-it checks that you're not using some old bisection branch).</p>\r
+<p>to get back to the original branch, instead of being on the bisection\r
+commit ("git bisect start" will do that for you too, actually: it will\r
+reset the bisection state).</p>\r
 <h3>Bisect visualize</h3>\r
 <p>During the bisection process, you can say</p>\r
 <div class="listingblock">\r
@@ -512,7 +511,7 @@ test processes and the scripts.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Jun-2008 01:33:20 UTC\r
+Last updated 15-Jun-2008 05:10:05 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-bisect.txt b/git-bisect.txt
index 37c7acbe9f88c7feae0f7f3936ae823b3a7a78a0..3ca0d330ad06e76d73657189c5f90e0994ba4505 100644 (file)
--- a/git-bisect.txt
+++ b/git-bisect.txt
@@ -85,10 +85,9 @@ Oh, and then after you want to reset to the original head, do a
 $ git bisect reset
 ------------------------------------------------
 
-to get back to the original branch, instead of being in one of the
-bisection branches ("git bisect start" will do that for you too,
-actually: it will reset the bisection state, and before it does that
-it checks that you're not using some old bisection branch).
+to get back to the original branch, instead of being on the bisection
+commit ("git bisect start" will do that for you too, actually: it will
+reset the bisection state).
 
 Bisect visualize
 ~~~~~~~~~~~~~~~~