diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2009-10-31 04:03:55 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2009-10-31 04:03:55 +0000 |
commit | c21ab059d7d4dcad19afc93fc1499e8a9b97fd7a (patch) | |
tree | e089d48d0f6440fa50436a1e9ad275bd4556332e /git-bisect.html | |
parent | 621e123b886211db461d69906b1e7c184c37263e (diff) | |
download | git-htmldocs-c21ab059d7d4dcad19afc93fc1499e8a9b97fd7a.tar.gz |
Autogenerated HTML docs for v1.6.5.2-140-g5f809
Diffstat (limited to 'git-bisect.html')
-rw-r--r-- | git-bisect.html | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/git-bisect.html b/git-bisect.html index 285fd5d29..52afca3b5 100644 --- a/git-bisect.html +++ b/git-bisect.html @@ -333,7 +333,7 @@ git bisect start [<bad> [<good>...]] [--] [<paths>...] git bisect bad [<rev>]
git bisect good [<rev>...]
git bisect skip [(<rev>|<range>)...]
-git bisect reset [<branch>]
+git bisect reset [<commit>]
git bisect visualize
git bisect replay <logfile>
git bisect log
@@ -380,15 +380,24 @@ 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, issue the
-following command:</p></div>
+<div class="para"><p>After a bisect session, to clean up the bisection state and return to
+the original HEAD, issue the following command:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git bisect reset</tt></pre>
</div></div>
-<div class="para"><p>This resets the tree to the original branch instead of being on the
-bisection commit ("git bisect start" will also do that, as it resets
-the bisection state).</p></div>
+<div class="para"><p>By default, this will return your tree to the commit that was checked
+out before <tt>git bisect start</tt>. (A new <tt>git bisect start</tt> will also do
+that, as it cleans up the old bisection state.)</p></div>
+<div class="para"><p>With an optional argument, you can return to a different commit
+instead:</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><tt>$ git bisect reset <commit></tt></pre>
+</div></div>
+<div class="para"><p>For example, <tt>git bisect reset HEAD</tt> will leave you on the current
+bisection commit and avoid switching commits at all, while <tt>git bisect
+reset bisect/bad</tt> will check out the first bad revision.</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>, issue the following
command during the bisection process:</p></div>
@@ -599,7 +608,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-07-02 03:16:40 UTC
+Last updated 2009-10-31 04:03:02 UTC
</div>
</div>
</body>
|