Autogenerated HTML docs for v1.5.1-rc1-41-gabba9

diff --git a/git-am.html b/git-am.html
index 993d2b4b874210117bcec11c90adb88a16b2c72c..cf5fead8f9db8aefdd4dfc015414c07bb4722516 100644 (file)
--- a/git-am.html
+++ b/git-am.html
@@ -388,7 +388,7 @@ default.   You could use <tt>--no-utf8</tt> to override this.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        These flag are passed to the <tt>git-apply</tt> program that applies\r
+        These flags are passed to the <tt>git-apply</tt> program that applies\r
         the patch.\r
 </p>\r
 </dd>\r
@@ -459,7 +459,7 @@ names.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Feb-2007 07:15:19 UTC\r
+Last updated 23-Mar-2007 10:46:02 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-am.txt b/git-am.txt
index 4fb1d844133ba8350361ee67d074935805a24156..13a738986776b931d1dc16f0aac3804e384d924c 100644 (file)
--- a/git-am.txt
+++ b/git-am.txt
@@ -70,7 +70,7 @@ default.   You could use `--no-utf8` to override this.
        the patch.
 
 -C<n>, -p<n>::
-       These flag are passed to the `git-apply` program that applies
+       These flags are passed to the `git-apply` program that applies
        the patch.
 
 --interactive::

diff --git a/git-bisect.html b/git-bisect.html
index cbf72abe9e7bbdedd295ca2189517bed0d186e6c..3353ef6bd22e328e438b254e1d9005ae335c1bed 100644 (file)
--- a/git-bisect.html
+++ b/git-bisect.html
@@ -286,7 +286,8 @@ git bisect good <rev>
 git bisect reset [<branch>]\r
 git bisect visualize\r
 git bisect replay <logfile>\r
-git bisect log</tt></pre>\r
+git bisect log\r
+git bisect run &lt;cmd&gt;...</tt></pre>\r
 </div></div>\r
 <p>This command uses <em>git-rev-list --bisect</em> option to help drive\r
 the binary search process to find which change introduced a bug,\r
@@ -370,6 +371,31 @@ like this:</p>
 <div class="content">\r
 <pre><tt>$ git bisect start arch/i386 include/asm-i386</tt></pre>\r
 </div></div>\r
+<p>If you have a script that can tell if the current\r
+source code is good or bad, you can automatically bisect using:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ git bisect run my_script</tt></pre>\r
+</div></div>\r
+<p>Note that the "run" script (<tt>my_script</tt> in the above example)\r
+should exit with code 0 in\r
+case the current source code is good and with a code between 1 and 127\r
+(included) in case the current source code is bad.</p>\r
+<p>Any other exit code (a program that does "exit(-1)" leaves $? = 255,\r
+see exit(3) manual page, the value is chopped with "&amp; 0377") will\r
+abort the automatic bisect process.</p>\r
+<p>You may often find that during bisect you want to have near-constant\r
+tweaks (e.g., s/#define DEBUG 0/#define DEBUG 1/ in a header file, or\r
+"revision that does not have this commit needs this patch applied to\r
+work around other problem this bisection is not interested in")\r
+applied to the revision being tested.</p>\r
+<p>To cope with such a situation, after the inner git-bisect finds the\r
+next revision to test, with the "run" script, you can apply that tweak\r
+before compiling, run the real test, and after the test decides if the\r
+revision (possibly with the needed tweaks) passed the test, rewind the\r
+tree to the pristine state.  Finally the "run" script can exit with\r
+the status of the real test to let "git bisect run" command loop to\r
+know the outcome.</p>\r
 </div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
@@ -385,7 +411,7 @@ like this:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jan-2007 00:37:12 UTC\r
+Last updated 23-Mar-2007 10:46:02 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-bisect.txt b/git-bisect.txt
index 16ec7269b29c995fe051f74a37ba9d015d972006..b7cd715380442b5af6124e642cdbf0210594c889 100644 (file)
--- a/git-bisect.txt
+++ b/git-bisect.txt
@@ -22,6 +22,7 @@ depending on the subcommand:
  git bisect visualize
  git bisect replay <logfile>
  git bisect log
+ git bisect run <cmd>...
 
 This command uses 'git-rev-list --bisect' option to help drive
 the binary search process to find which change introduced a bug,
@@ -121,6 +122,35 @@ like this:
 $ git bisect start arch/i386 include/asm-i386
 ------------
 
+If you have a script that can tell if the current
+source code is good or bad, you can automatically bisect using:
+
+------------
+$ git bisect run my_script
+------------
+
+Note that the "run" script (`my_script` in the above example)
+should exit with code 0 in
+case the current source code is good and with a code between 1 and 127
+(included) in case the current source code is bad.
+
+Any other exit code (a program that does "exit(-1)" leaves $? = 255,
+see exit(3) manual page, the value is chopped with "& 0377") will
+abort the automatic bisect process.
+
+You may often find that during bisect you want to have near-constant
+tweaks (e.g., s/#define DEBUG 0/#define DEBUG 1/ in a header file, or
+"revision that does not have this commit needs this patch applied to
+work around other problem this bisection is not interested in")
+applied to the revision being tested.
+
+To cope with such a situation, after the inner git-bisect finds the
+next revision to test, with the "run" script, you can apply that tweak
+before compiling, run the real test, and after the test decides if the
+revision (possibly with the needed tweaks) passed the test, rewind the
+tree to the pristine state.  Finally the "run" script can exit with
+the status of the real test to let "git bisect run" command loop to
+know the outcome.
 
 Author
 ------

diff --git a/git.html b/git.html
index 4a0a1b6bd75395686ebf07985b9fb4bf28e328d4..a243129798c42e510edb64a46c28a292382c99a3 100644 (file)
--- a/git.html
+++ b/git.html
@@ -2317,7 +2317,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Mar-2007 10:43:14 UTC\r
+Last updated 23-Mar-2007 10:46:03 UTC\r
 </div>\r
 </div>\r
 </body>\r