wisq · April 25, 2024 10:22 · Jul 25, 2014 · Jul 25, 2014 · Jul 25, 2014 · Jul 25, 2014
diff --git a/gistfile1.md b/gistfile1.md
@@ -18,6 +18,6 @@ Situation: Some commit (on master, but not necessarily head of master) has broke
 
 Now just follow the bisect.
 
-The `while` line has broken your commit up into small chunks.  If a chunk has actually broken syntax (so you can't test either way), you can `git bisect skip`.
+The `while` line has broken your commit up into small chunks, one commit per chunk.  If a chunk has actually broken syntax (so you can't test either way), you can `git bisect skip`.
 
 You can also `s/master/any-reference-branch-or-tag-or-sha/g`.  And you can use `s\ny\nq\n` if you want even smaller chunks (but more risk of syntax errors).
diff --git a/gistfile1.md b/gistfile1.md
@@ -9,7 +9,7 @@ Situation: Some commit (on master, but not necessarily head of master) has broke
 ```sh
 % git bisect start
 % git bisect good
-% while [ `git diff master | wc -l` -gt 0 ]; do echo -e "y\nq\n" | git co -p master; git commit -m 'partial undo'; done
+% while [ "`git diff master`" != "" ]; do echo -e "y\nq\n" | git checkout -p master; git commit -m 'partial undo'; done
 ```
 (test here to make sure we've recreated your problem)
 ```sh
@@ -18,4 +18,6 @@ Situation: Some commit (on master, but not necessarily head of master) has broke
 
 Now just follow the bisect.
 
-You can also `s/master/any-reference-branch-or-tag-or-sha/g`.
+The `while` line has broken your commit up into small chunks.  If a chunk has actually broken syntax (so you can't test either way), you can `git bisect skip`.
+
+You can also `s/master/any-reference-branch-or-tag-or-sha/g`.  And you can use `s\ny\nq\n` if you want even smaller chunks (but more risk of syntax errors).
diff --git a/gistfile1.md b/gistfile1.md
@@ -1,18 +1,18 @@
 Situation: Some commit (on master, but not necessarily head of master) has broken things, but it's a big commit and it's not clear what part broke things.
 
-```shell
+```sh
 % git checkout master
 % git checkout -b bisect-branch
 % git revert <offending commit>
 ```
 (test here to make sure reverting fixed your problem)
-```shell
+```sh
 % git bisect start
 % git bisect good
 % while [ `git diff master | wc -l` -gt 0 ]; do echo -e "y\nq\n" | git co -p master; git commit -m 'partial undo'; done
 ```
 (test here to make sure we've recreated your problem)
-```shell
+```sh
 % git bisect bad
 ```
 

diff --git a/gistfile1.md b/gistfile1.md
@@ -0,0 +1,21 @@
+Situation: Some commit (on master, but not necessarily head of master) has broken things, but it's a big commit and it's not clear what part broke things.
+
+```shell
+% git checkout master
+% git checkout -b bisect-branch
+% git revert <offending commit>
+```
+(test here to make sure reverting fixed your problem)
+```shell
+% git bisect start
+% git bisect good
+% while [ `git diff master | wc -l` -gt 0 ]; do echo -e "y\nq\n" | git co -p master; git commit -m 'partial undo'; done
+```
+(test here to make sure we've recreated your problem)
+```shell
+% git bisect bad
+```
+
+Now just follow the bisect.
+
+You can also `s/master/any-reference-branch-or-tag-or-sha/g`.
No results found