Skip to content

Commit 69bfdc6

Browse files
committed
Merge branch 'rd/bisect-view-is-visualize'
Doc and message updates to teach users "bisect view" is a synonym for "bisect visualize". * rd/bisect-view-is-visualize: bisect: mention "view" as an alternative to "visualize"
2 parents 26a45ea + dbc349b commit 69bfdc6

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

Documentation/git-bisect.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on the subcommand:
2323
git bisect terms [--term-good | --term-bad]
2424
git bisect skip [(<rev>|<range>)...]
2525
git bisect reset [<commit>]
26-
git bisect visualize
26+
git bisect (visualize|view)
2727
git bisect replay <logfile>
2828
git bisect log
2929
git bisect run <cmd>...
@@ -193,24 +193,23 @@ git bisect start --term-new fixed --term-old broken
193193
Then, use `git bisect <term-old>` and `git bisect <term-new>` instead
194194
of `git bisect good` and `git bisect bad` to mark commits.
195195

196-
Bisect visualize
197-
~~~~~~~~~~~~~~~~
196+
Bisect visualize/view
197+
~~~~~~~~~~~~~~~~~~~~~
198198

199199
To see the currently remaining suspects in 'gitk', issue the following
200-
command during the bisection process:
200+
command during the bisection process (the subcommand `view` can be used
201+
as an alternative to `visualize`):
201202

202203
------------
203204
$ git bisect visualize
204205
------------
205206

206-
`view` may also be used as a synonym for `visualize`.
207-
208207
If the `DISPLAY` environment variable is not set, 'git log' is used
209208
instead. You can also give command-line options such as `-p` and
210209
`--stat`.
211210

212211
------------
213-
$ git bisect view --stat
212+
$ git bisect visualize --stat
214213
------------
215214

216215
Bisect log and bisect replay

builtin/bisect--helper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static int check_term_format(const char *term, const char *orig_term)
4646
return error(_("'%s' is not a valid term"), term);
4747

4848
if (one_of(term, "help", "start", "skip", "next", "reset",
49-
"visualize", "replay", "log", "run", "terms", NULL))
49+
"visualize", "view", "replay", "log", "run", "terms", NULL))
5050
return error(_("can't use the builtin command '%s' as a term"), term);
5151

5252
/*

git-bisect.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|replay|log|run]'
3+
USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|view|replay|log|run]'
44
LONG_USAGE='git bisect help
55
print this long help message.
66
git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]
@@ -20,7 +20,7 @@ git bisect next
2020
find next bisection to test and check it out.
2121
git bisect reset [<commit>]
2222
finish bisection search and go back to commit.
23-
git bisect visualize
23+
git bisect (visualize|view)
2424
show bisect status in gitk.
2525
git bisect replay <logfile>
2626
replay bisection log.

0 commit comments

Comments
 (0)