Merge branch 'rs/checkout-no-overlay-pathspec-fix'

[thirdparty/git.git] / git-bisect.sh

diff --git a/git-bisect.sh b/git-bisect.sh
index f03fbb18f00403b2786f5b4cb1b18e30b1e820b2..c28e35b0fa8039f9d9ccf0925c1e17ac79c70dbe 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -4,7 +4,7 @@ USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|view|replay|
 LONG_USAGE='git bisect help
        print this long help message.
 git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]
-                [--no-checkout] [<bad> [<good>...]] [--] [<pathspec>...]
+                [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]
        reset bisect state and start bisection.
 git bisect (bad|new) [<rev>]
        mark <rev> a known-bad revision/
@@ -153,7 +153,7 @@ bisect_next() {
        git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD $TERM_GOOD|| exit
 
        # Perform all bisection computation, display and checkout
-       git bisect--helper --next-all $(git rev-parse --verify -q BISECT_HEAD > /dev/null && echo --no-checkout)
+       git bisect--helper --next-all
        res=$?
 
        # Check if we should exit because bisection is finished