Merge branch 'jc/maint-doc-em-dash'
commit7bdaf0bd1cffde9b3d14762f67f22991e8e17ef6
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2010 16:43:42 +0000 (3 09:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2010 16:43:42 +0000 (3 09:43 -0700)
tree7b77d403201c495a69ffb2123d64fcea03f2e05c
parentb9f171cc3b3f7f528acf672b5fef7e95b153213b
parent2839478774f48074d7d87b8a9838827742a5b058
Merge branch 'jc/maint-doc-em-dash'

* jc/maint-doc-em-dash:
  Work around em-dash handling in newer AsciiDoc
Documentation/asciidoc.conf
Documentation/git-add.txt
Documentation/git-instaweb.txt