From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Jun 2026 18:10:11 +0000 (-0700)
Subject: Merge branch 'ta/doc-config-adoc-fixes'
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c706d509299d4bd6065214699d2c0382ea9faa9;p=thirdparty%2Fgit.git

Merge branch 'ta/doc-config-adoc-fixes'

Various AsciiDoc markup fixes in 'git config' documentation and
related files to ensure lists and formatting are rendered correctly.

* ta/doc-config-adoc-fixes:
  doc: git-config: escape erroneous highlight markup
  doc: config/sideband: fix description list delimiter
  doc: config: terminate runaway lists
---

0c706d509299d4bd6065214699d2c0382ea9faa9
diff --cc Documentation/config/safe.adoc
index 5b1690aebe,5ae4476b24..99fbfc0618
--- a/Documentation/config/safe.adoc
+++ b/Documentation/config/safe.adoc
@@@ -2,12 -2,12 +2,14 @@@ safe.bareRepository:
  	Specifies which bare repositories Git will work with. The currently
  	supported values are:
  +
+ --
 -* `all`: Git works with all bare repositories. This is the default.
 +* `all`: Git works with all bare repositories. This is the default in
 +  Git 2.x.
  * `explicit`: Git only works with bare repositories specified via
    the top-level `--git-dir` command-line option, or the `GIT_DIR`
 -  environment variable (see linkgit:git[1]).
 +  environment variable (see linkgit:git[1]). This will be the default
 +  in Git 3.0.
+ --
  +
  If you do not use bare repositories in your workflow, then it may be
  beneficial to set `safe.bareRepository` to `explicit` in your global