Documentation: reworded the "Description" section of git-bisect.txt.
Added fixes missing from 2364259. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David J. Mellor committed
Mar 19, 2009 at 00:00 UTC
ee9cf14d25267aaed4b1533f92e9e5e74d5a4383
1 file changed
+9
-8
Documentation/git-bisect.txt
+9
-8
@@ -114,21 +114,22 @@ $ git bisect view --stat
114
Bisect log and bisect replay
115
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
116
117
-The good/bad input is logged, and:
117
+After having marked revisions as good or bad, then:
118
119
------------
120
$ git bisect log
121
------------
122
123
-shows what you have done so far. You can truncate its output somewhere
124
-and save it in a file, and run:
123
+shows what you have done so far. If you discover that you made a mistake
124
+in specifying the status of a revision, you can save the output of this
125
+command to a file, edit it to remove the incorrect entries, and then issue
126
+the following commands to return to a corrected state:
127
128
------------
129
+$ git bisect reset
130
$ git bisect replay that-file
131
------------
132
130
-if you find later that you made a mistake specifying revisions as good/bad.
131
-
133
Avoiding testing a commit
134
~~~~~~~~~~~~~~~~~~~~~~~~~
135
@@ -141,7 +142,7 @@ want to find a nearby commit and try that instead.
142
For example:
143
144
------------
144
-$ git bisect good/bad # previous round was good/bad.
145
+$ git bisect good/bad # previous round was good or bad.
146
Bisecting: 337 revisions left to test after this
147
$ git bisect visualize # oops, that is uninteresting.
148
$ git reset --hard HEAD~3 # try 3 revisions before what
@@ -149,7 +150,7 @@ $ git reset --hard HEAD~3 # try 3 revisions before what
150
------------
151
152
Then compile and test the chosen revision. Afterwards the revision
152
-is marked as good/bad in the usual manner.
153
+is marked as good or bad in the usual manner.
154
155
Bisect skip
156
~~~~~~~~~~~~
@@ -240,7 +241,7 @@ before compiling, run the real test, and afterwards decide if the
241
revision (possibly with the needed patch) passed the test and then
242
rewind the tree to the pristine state. Finally the script should exit
243
with the status of the real test to let the "git bisect run" command loop
243
-to determine the eventual outcome of the bisect session.
244
+determine the eventual outcome of the bisect session.
245
246
EXAMPLES
247
--------