undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rd/bisect-view-is-visualize'

Browse Source 
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"
This commit is contained in:
Junio C Hamano 2017-11-15 12:14:36 +09:00
commit 69bfdc614e
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/git-bisect.txt
View File

@ -23,7 +23,7 @@ on the subcommand:
git bisect terms [--term-good | --term-bad] git bisect terms [--term-good | --term-bad]
git bisect skip [(<rev>|<range>)...] git bisect skip [(<rev>|<range>)...]
git bisect reset [<commit>] git bisect reset [<commit>]
git bisect visualize git bisect (visualize|view)
git bisect replay <logfile> git bisect replay <logfile>
git bisect log git bisect log
git bisect run <cmd>... 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 Then, use `git bisect <term-old>` and `git bisect <term-new>` instead
of `git bisect good` and `git bisect bad` to mark commits. 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 If the `DISPLAY` environment variable is not set, 'git log' is used
instead. You can also give command-line options such as `-p` and instead. You can also give command-line options such as `-p` and
`--stat`. `--stat`.
------------ ------------
$ git bisect view --stat $ git bisect visualize --stat
------------ ------------
Bisect log and bisect replay Bisect log and bisect replay

2
builtin/bisect--helper.c
View File

@ -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); return error(_("'%s' is not a valid term"), term);
if (one_of(term, "help", "start", "skip", "next", "reset", 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);
/* /*

4
git-bisect.sh
View File

@ -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 LONG_USAGE='git bisect help
print this long help message. print this long help message.
git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>] 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. find next bisection to test and check it out.
git bisect reset [<commit>] git bisect reset [<commit>]
finish bisection search and go back to commit. finish bisection search and go back to commit.
git bisect visualize git bisect (visualize|view)
show bisect status in gitk. show bisect status in gitk.
git bisect replay <logfile> git bisect replay <logfile>
replay bisection log. replay bisection log.