diff options
| author | Stephan Beyer <s-beyer@gmx.net> | 2016-04-10 15:18:54 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-15 12:27:29 -0700 |
| commit | c11f4a972099b1a43fee29018e082ec015a7f2af (patch) | |
| tree | 33d550909de849055feb4ba673f2e59d960c6b4e /git-bisect.sh | |
| parent | b8b4d93100651876299eabaf76248510e616fab3 (diff) | |
| download | git-c11f4a972099b1a43fee29018e082ec015a7f2af.tar.gz | |
bisect: write about `bisect next` in documentation
Mention `bisect next` in the documentation of bisect.
`bisect next` is only useful in rare cases and the result
can also be accomplished using other utilities (like reflog).
However, it is available as a bisect command and should hence be
documented.
Also mention the use case when no good commit is known.
Some user message in git-bisect.sh is changed to reflect that
use case. It is also simplified: there is no need to mention
running `bisect start` explicitly, because it can be done
indirectly using `bisect bad`.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Diffstat (limited to 'git-bisect.sh')
| -rwxr-xr-x | git-bisect.sh | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/git-bisect.sh b/git-bisect.sh index 5d1cb00d86..5c93a27fe2 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -334,16 +334,10 @@ bisect_next_check() { *) bad_syn=$(bisect_voc bad) good_syn=$(bisect_voc good) - if test -s "$GIT_DIR/BISECT_START" - then - - eval_gettextln "You need to give me at least one \$bad_syn and one \$good_syn revision. -(You can use \"git bisect \$bad_syn\" and \"git bisect \$good_syn\" for that.)" >&2 - else - eval_gettextln "You need to start by \"git bisect start\". -You then need to give me at least one \$good_syn and one \$bad_syn revision. -(You can use \"git bisect \$bad_syn\" and \"git bisect \$good_syn\" for that.)" >&2 - fi + eval_gettextln "You need to give me at least one \$bad_syn revision. +Use \"git bisect \$bad_syn\" for that. One \$good_syn revision is also helpful +for bisecting (use \"git bisect \$good_syn\"). If you do not know one \$good_syn +revision, you can use \"git bisect next\" to find one." >&2 exit 1 ;; esac } @@ -677,7 +671,6 @@ case "$#" in skip) bisect_skip "$@" ;; next) - # Not sure we want "next" at the UI level anymore. bisect_next "$@" ;; visualize|view) bisect_visualize "$@" ;; |