From: Junio C Hamano Date: Wed, 4 Nov 2015 22:20:45 +0000 (-0800) Subject: Merge branch 'jc/em-dash-in-doc' into maint X-Git-Tag: v2.6.3~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc1e0481bf0a01e4f4741ee206cc0d81e667d73a;p=thirdparty%2Fgit.git Merge branch 'jc/em-dash-in-doc' into maint AsciiDoc markup fixes. * jc/em-dash-in-doc: Documentation: AsciiDoc spells em-dash as double-dashes, not triple --- bc1e0481bf0a01e4f4741ee206cc0d81e667d73a diff --cc Documentation/git-bisect.txt index e97f2de21b,617efa0559..0e7482b4c9 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@@ -253,9 -245,9 +253,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