bisect: mention "view" as an alternative to "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>

diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 6c42abf070df93187e11dd31d263b199346cace2..4a1417bdcd7826d444dbfd4cbc438ec9ec2edf1b 100644 (file)
--- 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 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>...
  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.
 
 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
 
 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
 ------------
 
 
 ------------
 $ 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`.
 
 ------------
 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
 ------------
 
 Bisect log and bisect replay

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 35d2105f941c66c7c45605a48af8494b51806fcf..4b5fadcbe1ae6a1b10fe88e80a5fcffd3296cfa7 100644 (file)
--- 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",
                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);
 
        /*
                return error(_("can't use the builtin command '%s' as a term"), term);
 
        /*

diff --git a/git-bisect.sh b/git-bisect.sh
index 0138a8860e3779cf62210d8d54d2eada020be12f..a82256e345dcdfdade6f6196531d2c745cb52a29 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/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>]
 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.
        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.
        show bisect status in gitk.
 git bisect replay <logfile>
        replay bisection log.