From: Junio C Hamano Date: Thu, 29 Oct 2015 20:59:16 +0000 (-0700) Subject: Merge branch 'jc/em-dash-in-doc' X-Git-Tag: v2.7.0-rc0~69 X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=73167677c0a0e51b3b6505a4287dd3cbf7f11497;p=git.git Merge branch 'jc/em-dash-in-doc' AsciiDoc markup fixes. * jc/em-dash-in-doc: Documentation: AsciiDoc spells em-dash as double-dashes, not triple --- 73167677c0a0e51b3b6505a4287dd3cbf7f11497 diff --cc Documentation/git-bisect.txt index 51cacd7169,617efa0559..7e79aaedeb --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@@ -335,9 -245,9 +335,9 @@@ 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). +`bisect run` is concerned). You may often find that during a bisect session you want to have temporary modifications (e.g. s/#define DEBUG 0/#define DEBUG 1/ in a