diff options
| author | Robert P. J. Day <rpjday@crashcourse.ca> | 2017-11-12 04:30:38 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-13 10:51:14 +0900 |
| commit | dbc349bba0ddf118b0ec8404ec01014d49cecfd3 (patch) | |
| tree | f11d6a41ce2b854e8eb1056b92d866967fc3cbc1 | |
| parent | 4123bcaed0897cad152c052a5fa4e499e4dafcf4 (diff) | |
| download | git-rd/bisect-view-is-visualize.tar.gz | |
bisect: mention "view" as an alternative to "visualize"rd/bisect-view-is-visualize
Tweak a small number of files to mention "view" as an alternative to
"visualize".
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-bisect.txt | 13 | ||||
| -rw-r--r-- | builtin/bisect--helper.c | 2 | ||||
| -rwxr-xr-x | git-bisect.sh | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index 6c42abf070..4a1417bdcd 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -23,7 +23,7 @@ on the subcommand: git bisect terms [--term-good | --term-bad] git bisect skip [(<rev>|<range>)...] git bisect reset [<commit>] - git bisect visualize + git bisect (visualize|view) git bisect replay <logfile> git bisect log git bisect run <cmd>... @@ -193,24 +193,23 @@ git bisect start --term-new fixed --term-old broken Then, use `git bisect <term-old>` and `git bisect <term-new>` instead of `git bisect good` and `git bisect bad` to mark commits. -Bisect visualize -~~~~~~~~~~~~~~~~ +Bisect visualize/view +~~~~~~~~~~~~~~~~~~~~~ To see the currently remaining suspects in 'gitk', issue the following -command during the bisection process: +command during the bisection process (the subcommand `view` can be used +as an alternative to `visualize`): ------------ $ git bisect visualize ------------ -`view` may also be used as a synonym for `visualize`. - If the `DISPLAY` environment variable is not set, 'git log' is used instead. You can also give command-line options such as `-p` and `--stat`. ------------ -$ git bisect view --stat +$ git bisect visualize --stat ------------ Bisect log and bisect replay diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 35d2105f94..4b5fadcbe1 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -46,7 +46,7 @@ static int check_term_format(const char *term, const char *orig_term) return error(_("'%s' is not a valid term"), term); if (one_of(term, "help", "start", "skip", "next", "reset", - "visualize", "replay", "log", "run", "terms", NULL)) + "visualize", "view", "replay", "log", "run", "terms", NULL)) return error(_("can't use the builtin command '%s' as a term"), term); /* diff --git a/git-bisect.sh b/git-bisect.sh index 0138a8860e..a82256e345 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -1,6 +1,6 @@ #!/bin/sh -USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|replay|log|run]' +USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|view|replay|log|run]' LONG_USAGE='git bisect help print this long help message. git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>] @@ -20,7 +20,7 @@ git bisect next find next bisection to test and check it out. git bisect reset [<commit>] finish bisection search and go back to commit. -git bisect visualize +git bisect (visualize|view) show bisect status in gitk. git bisect replay <logfile> replay bisection log. |