Skip to content

Commit

Permalink
Documentation: reworded the "Description" section of git-bisect.txt.
Browse files Browse the repository at this point in the history
Added fixes missing from 2364259.

Signed-off-by: David J. Mellor <dmellor@whistlingcat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
David J. Mellor authored and Junio C Hamano committed Mar 19, 2009
1 parent e5ac121 commit ee9cf14
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions Documentation/git-bisect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,21 +114,22 @@ $ git bisect view --stat
Bisect log and bisect replay
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

The good/bad input is logged, and:
After having marked revisions as good or bad, then:

------------
$ git bisect log
------------

shows what you have done so far. You can truncate its output somewhere
and save it in a file, and run:
shows what you have done so far. If you discover that you made a mistake
in specifying the status of a revision, you can save the output of this
command to a file, edit it to remove the incorrect entries, and then issue
the following commands to return to a corrected state:

------------
$ git bisect reset
$ git bisect replay that-file
------------

if you find later that you made a mistake specifying revisions as good/bad.

Avoiding testing a commit
~~~~~~~~~~~~~~~~~~~~~~~~~

Expand All @@ -141,15 +142,15 @@ want to find a nearby commit and try that instead.
For example:

------------
$ git bisect good/bad # previous round was good/bad.
$ git bisect good/bad # previous round was good or bad.
Bisecting: 337 revisions left to test after this
$ git bisect visualize # oops, that is uninteresting.
$ git reset --hard HEAD~3 # try 3 revisions before what
# was suggested
------------

Then compile and test the chosen revision. Afterwards the revision
is marked as good/bad in the usual manner.
is marked as good or bad in the usual manner.

Bisect skip
~~~~~~~~~~~~
Expand Down Expand Up @@ -240,7 +241,7 @@ before compiling, run the real test, and afterwards decide if the
revision (possibly with the needed patch) passed the test and then
rewind the tree to the pristine state. Finally the script should exit
with the status of the real test to let the "git bisect run" command loop
to determine the eventual outcome of the bisect session.
determine the eventual outcome of the bisect session.

EXAMPLES
--------
Expand Down

0 comments on commit ee9cf14

Please sign in to comment.