From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Jan 2017 23:59:22 +0000 (-0800)
Subject: Merge branch 'ad/bisect-terms'
X-Git-Tag: v2.12.0-rc0~48
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e94577039564ace7b7fb8186d170ea7350f55e4c?ds=inline;hp=-c

Merge branch 'ad/bisect-terms'

Documentation fix.

* ad/bisect-terms:
Documentation/bisect: improve on (bad|new) and (good|bad)
---

e94577039564ace7b7fb8186d170ea7350f55e4c
diff --combined Documentation/git-bisect.txt
index 2bb9a577a2,b35218adf0..bdd915a66b
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@@ -18,8 -18,8 +18,8 @@@ on the subcommand
  
   git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]
  		  [--no-checkout] [<bad> [<good>...]] [--] [<paths>...]
-  git bisect (bad|new) [<rev>]
-  git bisect (good|old) [<rev>...]
+  git bisect (bad|new|<term-new>) [<rev>]
+  git bisect (good|old|<term-old>) [<rev>...]
   git bisect terms [--term-good | --term-bad]
   git bisect skip [(<rev>|<range>)...]
   git bisect reset [<commit>]
@@@ -205,7 -205,7 +205,7 @@@ $ git bisect visualiz
  
  `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
  `--stat`.
  
@@@ -256,7 -256,7 +256,7 @@@ Then compile and test the chosen revisi
  the revision as good or bad in the usual manner.
  
  Bisect skip
 -~~~~~~~~~~~~
 +~~~~~~~~~~~
  
  Instead of choosing a nearby commit by yourself, you can ask Git to do
  it for you by issuing the command:
@@@ -335,7 -335,7 +335,7 @@@ cannot be tested. If the script exits w
  revision will be skipped (see `git bisect skip` above). 125 was chosen
  as the highest sensible value to use for this purpose, because 126 and 127
  are used by POSIX shells to signal specific error status (127 is for
 -command not found, 126 is for command found but not executable---these
 +command not found, 126 is for command found but not executable--these
  details do not matter, as they are normal errors in the script, as far as
  `bisect run` is concerned).
  
@@@ -358,7 -358,7 +358,7 @@@ OPTION
  --no-checkout::
  +
  Do not checkout the new working tree at each iteration of the bisection
 -process. Instead just update a special reference named 'BISECT_HEAD' to make
 +process. Instead just update a special reference named `BISECT_HEAD` to make
  it point to the commit that should be tested.
  +
  This option may be useful when the test you would perform in each step