From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 6 Oct 2019 03:25:16 +0000 (+0900)
Subject: Merge branch 'ma/asciidoctor-more-fixes'
X-Git-Tag: v2.24.0-rc0~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=314fcd32d79c2c9ccf471f5a84f1407393d1a1fc;p=thirdparty%2Fgit.git

Merge branch 'ma/asciidoctor-more-fixes'

Doc formatting updates.

* ma/asciidoctor-more-fixes:
  gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
  git-merge-index.txt: wrap shell listing in "----"
  git-receive-pack.txt: wrap shell [script] listing in "----"
  git-ls-remote.txt: wrap shell listing in "----"
  Documentation: wrap config listings in "----"
  git-merge-base.txt: render indentations correctly under Asciidoctor
  Documentation: wrap blocks with "--"
---

314fcd32d79c2c9ccf471f5a84f1407393d1a1fc