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

diff --cc Documentation/git-bisect.txt
index e97f2de21bdc58cc2de35731f7b339353b121bd0,617efa0559eb6b64af0b4776b3fa5dcd55da8af5..0e7482b4c9a7ac839e070db8492cfadce72ce3e8
--- 1/Documentation/git-bisect.txt
--- 2/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

diff --cc Documentation/git-fetch.txt
Simple merge

diff --cc Documentation/git-push.txt
Simple merge

diff --cc Documentation/technical/index-format.txt
Simple merge