summaryrefslogtreecommitdiffstats
path: root/git-bisect.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-03-26 08:39:38 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-03-26 08:39:38 +0000
commit1de7572eb1aa483cc2aaca1db274928ffc6830f0 (patch)
treeac708c90ee1a4a4765a9e852319760583d609fc6 /git-bisect.html
parent625716ad62c5c0b2c57c90079944a7f6b914bb09 (diff)
downloadgit-htmldocs-1de7572eb1aa483cc2aaca1db274928ffc6830f0.tar.gz
Autogenerated HTML docs for v1.6.2.1-389-geed1
Diffstat (limited to 'git-bisect.html')
-rw-r--r--git-bisect.html24
1 files changed, 12 insertions, 12 deletions
diff --git a/git-bisect.html b/git-bisect.html
index cdf900358..88d02f456 100644
--- a/git-bisect.html
+++ b/git-bisect.html
@@ -380,7 +380,7 @@ or "git bisect bad" to ask for the next bisection.</p></div>
<div class="para"><p>Eventually there will be no more revisions left to bisect, and you
will have been left with the first bad kernel revision in "refs/bisect/bad".</p></div>
<h3 id="_bisect_reset">Bisect reset</h3><div style="clear:left"></div>
-<div class="para"><p>To return to the original head after a bisect session, you issue the
+<div class="para"><p>To return to the original head after a bisect session, issue the
following command:</p></div>
<div class="listingblock">
<div class="content">
@@ -390,8 +390,8 @@ following command:</p></div>
bisection commit ("git bisect start" will also do that, as it resets
the bisection state).</p></div>
<h3 id="_bisect_visualize">Bisect visualize</h3><div style="clear:left"></div>
-<div class="para"><p>To see the currently remaining suspects in <em>gitk</em>, the following command
-is issued during the bisection process:</p></div>
+<div class="para"><p>To see the currently remaining suspects in <em>gitk</em>, issue the following
+command during the bisection process:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git bisect visualize</tt></pre>
@@ -405,7 +405,7 @@ instead. You can also give command line options such as <tt>-p</tt> and
<pre><tt>$ git bisect view --stat</tt></pre>
</div></div>
<h3 id="_bisect_log_and_bisect_replay">Bisect log and bisect replay</h3><div style="clear:left"></div>
-<div class="para"><p>After having marked revisions as good or bad, you issue the following
+<div class="para"><p>After having marked revisions as good or bad, issue the following
command to show what has been done so far:</p></div>
<div class="listingblock">
<div class="content">
@@ -421,7 +421,7 @@ return to a corrected state:</p></div>
$ git bisect replay that-file</tt></pre>
</div></div>
<h3 id="_avoiding_testing_a_commit">Avoiding testing a commit</h3><div style="clear:left"></div>
-<div class="para"><p>If in the middle of a bisect session, you know that the next suggested
+<div class="para"><p>If, in the middle of a bisect session, you know that the next suggested
revision is not a good one to test (e.g. the change the commit
introduces is known not to work in your environment and you know it
does not have anything to do with the bug you are chasing), you may
@@ -435,8 +435,8 @@ $ git bisect visualize # oops, that is uninteresting.
$ git reset --hard HEAD~3 # try 3 revisions before what
# was suggested</tt></pre>
</div></div>
-<div class="para"><p>Then compile and test the chosen revision. Afterwards the revision
-is marked as good or bad in the usual manner.</p></div>
+<div class="para"><p>Then compile and test the chosen revision, and afterwards mark
+the revision as good or bad in the usual manner.</p></div>
<h3 id="_bisect_skip">Bisect skip</h3><div style="clear:left"></div>
<div class="para"><p>Instead of choosing by yourself a nearby commit, you can ask git
to do it for you by issuing the command:</p></div>
@@ -453,16 +453,16 @@ using the "<em>&lt;commit1&gt;</em>..<em>&lt;commit2&gt;</em>" notation. For exa
<div class="content">
<pre><tt>$ git bisect skip v2.5..v2.6</tt></pre>
</div></div>
-<div class="para"><p>The effect of this would be that no commit between <tt>v2.5</tt> excluded and
-<tt>v2.6</tt> included could be tested.</p></div>
+<div class="para"><p>This tells the bisect process that no commit after <tt>v2.5</tt>, up to and
+including <tt>v2.6</tt>, should be tested.</p></div>
<div class="para"><p>Note that if you also want to skip the first commit of the range you
would issue the command:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git bisect skip v2.5 v2.5..v2.6</tt></pre>
</div></div>
-<div class="para"><p>This would cause the commits between <tt>v2.5</tt> included and <tt>v2.6</tt> included
-to be skipped.</p></div>
+<div class="para"><p>This tells the bisect process that the commits between <tt>v2.5</tt> included
+and <tt>v2.6</tt> included should be skipped.</p></div>
<h3 id="_cutting_down_bisection_by_giving_more_parameters_to_bisect_start">Cutting down bisection by giving more parameters to bisect start</h3><div style="clear:left"></div>
<div class="para"><p>You can further cut down the number of trials, if you know what part of
the tree is involved in the problem you are tracking down, by specifying
@@ -600,7 +600,7 @@ $ git bisect run sh -c "make || exit 125; ~/check_test_case.sh"</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-03-22 08:21:21 UTC
+Last updated 2009-03-26 08:39:12 UTC
</div>
</div>
</body>