From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Apr 2018 04:28:56 +0000 (+0900)
Subject: Merge branch 'ak/bisect-doc-typofix'
X-Git-Tag: v2.18.0-rc0~122
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f2d5e076674cccbe83d7f069201ec23608726650

Merge branch 'ak/bisect-doc-typofix'

Docfix.

* ak/bisect-doc-typofix:
Documentation/git-bisect.txt: git bisect term → git bisect terms
---

f2d5e076674cccbe83d7f069201ec23608726650
diff --cc Documentation/git-bisect.txt
index 4a1417bdcd,0b305a6c21..4b45d837a7
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@@ -165,40 -164,14 +165,40 @@@ To get a reminder of the currently use
  git bisect terms
  ------------------------------------------------
  
- You can get just the old (respectively new) term with `git bisect term
- --term-old` or `git bisect term --term-good`.
+ You can get just the old (respectively new) term with `git bisect terms
+ --term-old` or `git bisect terms --term-good`.
  
 -Bisect visualize
 -~~~~~~~~~~~~~~~~
 +If you would like to use your own terms instead of "bad"/"good" or
 +"new"/"old", you can choose any names you like (except existing bisect
 +subcommands like `reset`, `start`, ...) by starting the
 +bisection using
 +
 +------------------------------------------------
 +git bisect start --term-old <term-old> --term-new <term-new>
 +------------------------------------------------
 +
 +For example, if you are looking for a commit that introduced a
 +performance regression, you might use
 +
 +------------------------------------------------
 +git bisect start --term-old fast --term-new slow
 +------------------------------------------------
 +
 +Or if you are looking for the commit that fixed a bug, you might use
 +
 +------------------------------------------------
 +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/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