aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-30 20:07:00 -0700
committerJunio C Hamano <gitster@pobox.com>2009-10-30 20:07:00 -0700
commit4b3c1800613fcebdb3c6d7e99bfd8e670ec67248 (patch)
tree954b139104119e21e02fbbe4e1c1ea8e1f0b9e84 /Documentation
parent92246f6bcf41f1287009e73fc501c36ae9fdeeb4 (diff)
parent6b87ce231d14b3804974fba27576f1f2ba77cfb0 (diff)
downloadgit-4b3c1800613fcebdb3c6d7e99bfd8e670ec67248.tar.gz
git-4b3c1800613fcebdb3c6d7e99bfd8e670ec67248.tar.xz
Merge branch 'ak/bisect-reset-to-switch'
* ak/bisect-reset-to-switch: bisect reset: Allow resetting to any commit, not just a branch
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-bisect.txt23
1 files changed, 17 insertions, 6 deletions
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 63e7a42cb..d2ffae0c1 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -20,7 +20,7 @@ on the subcommand:
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
@@ -81,16 +81,27 @@ will have been left with the first bad kernel revision in "refs/bisect/bad".
Bisect reset
~~~~~~~~~~~~
-To return to the original head after a bisect session, issue the
-following command:
+After a bisect session, to clean up the bisection state and return to
+the original HEAD, issue the following command:
------------------------------------------------
$ git bisect reset
------------------------------------------------
-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).
+By default, this will return your tree to the commit that was checked
+out before `git bisect start`. (A new `git bisect start` will also do
+that, as it cleans up the old bisection state.)
+
+With an optional argument, you can return to a different commit
+instead:
+
+------------------------------------------------
+$ git bisect reset <commit>
+------------------------------------------------
+
+For example, `git bisect reset HEAD` will leave you on the current
+bisection commit and avoid switching commits at all, while `git bisect
+reset bisect/bad` will check out the first bad revision.
Bisect visualize
~~~~~~~~~~~~~~~~