@@ -50,28 +50,29 @@ $ git bisect good v2.6.13-rc2 # v2.6.13-rc2 was the last version
50
50
------------------------------------------------
51
51
52
52
When you have specified at least one bad and one good version, the
53
- command bisects the revision tree and outputs something similar to:
53
+ command bisects the revision tree and outputs something similar to
54
+ the following:
54
55
55
56
------------------------------------------------
56
57
Bisecting: 675 revisions left to test after this
57
58
------------------------------------------------
58
59
59
- and then checks out the state in the middle. You would now compile
60
- that kernel and boot it. If the booted kernel works correctly, you
61
- would then issue the following command:
60
+ The state in the middle of the set of revisions is then checked out.
61
+ You would now compile that kernel and boot it. If the booted kernel
62
+ works correctly, you would then issue the following command:
62
63
63
64
------------------------------------------------
64
65
$ git bisect good # this one is good
65
66
------------------------------------------------
66
67
67
- which would then output something similar to:
68
+ The output of this command would be something similar to the following :
68
69
69
70
------------------------------------------------
70
71
Bisecting: 337 revisions left to test after this
71
72
------------------------------------------------
72
73
73
- and you continue along , compiling that one , testing it, and depending
74
- on whether it is good or bad issuing the command "git bisect good"
74
+ You keep repeating this process , compiling the tree , testing it, and
75
+ depending on whether it is good or bad issuing the command "git bisect good"
75
76
or "git bisect bad" to ask for the next bisection.
76
77
77
78
Eventually there will be no more revisions left to bisect, and you
@@ -81,7 +82,7 @@ Bisect reset
81
82
~~~~~~~~~~~~
82
83
83
84
To return to the original head after a bisect session, you issue the
84
- command:
85
+ following command:
85
86
86
87
------------------------------------------------
87
88
$ git bisect reset
@@ -94,14 +95,14 @@ the bisection state).
94
95
Bisect visualize
95
96
~~~~~~~~~~~~~~~~
96
97
97
- During the bisection process, you issue the command:
98
+ To see the currently remaining suspects in 'gitk', the following command
99
+ is issued during the bisection process:
98
100
99
101
------------
100
102
$ git bisect visualize
101
103
------------
102
104
103
- to see the currently remaining suspects in 'gitk'. `view` may also
104
- be used as a synonym for `visualize`.
105
+ `view` may also be used as a synonym for `visualize`.
105
106
106
107
If the 'DISPLAY' environment variable is not set, 'git log' is used
107
108
instead. You can also give command line options such as `-p` and
@@ -114,16 +115,17 @@ $ git bisect view --stat
114
115
Bisect log and bisect replay
115
116
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
116
117
117
- After having marked revisions as good or bad, then:
118
+ After having marked revisions as good or bad, you issue the following
119
+ command to show what has been done so far:
118
120
119
121
------------
120
122
$ git bisect log
121
123
------------
122
124
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:
125
+ If you discover that you made a mistake in specifying the status of a
126
+ revision, you can save the output of this command to a file, edit it to
127
+ remove the incorrect entries, and then issue the following commands to
128
+ return to a corrected state:
127
129
128
130
------------
129
131
$ git bisect reset
@@ -173,8 +175,8 @@ using the "'<commit1>'..'<commit2>'" notation. For example:
173
175
$ git bisect skip v2.5..v2.6
174
176
------------
175
177
176
- would mean that no commit between `v2.5` excluded and `v2.6` included
177
- can be tested.
178
+ The effect of this would be that no commit between `v2.5` excluded and
179
+ `v2.6` included could be tested.
178
180
179
181
Note that if you also want to skip the first commit of the range you
180
182
would issue the command:
@@ -183,14 +185,16 @@ would issue the command:
183
185
$ git bisect skip v2.5 v2.5..v2.6
184
186
------------
185
187
186
- and the commit pointed to by `v2.5` would also be skipped.
188
+ This would cause the commits between `v2.5` included and `v2.6` included
189
+ to be skipped.
190
+
187
191
188
192
Cutting down bisection by giving more parameters to bisect start
189
193
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
190
194
191
195
You can further cut down the number of trials, if you know what part of
192
196
the tree is involved in the problem you are tracking down, by specifying
193
- path parameters when issuing the `bisect start` command, like this :
197
+ path parameters when issuing the `bisect start` command:
194
198
195
199
------------
196
200
$ git bisect start -- arch/i386 include/asm-i386
0 commit comments