From: Junio C Hamano Date: Sun, 5 Oct 2025 22:04:14 +0000 (-0700) Subject: Merge branch 'ja/doc-markup-attached-paragraph-fix' into jch X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4078c3d04bf83845b7f7d4f073685ddd934461c;p=thirdparty%2Fgit.git Merge branch 'ja/doc-markup-attached-paragraph-fix' into jch Documentation mark-up fix. * ja/doc-markup-attached-paragraph-fix: doc: change the markup of paragraphs following a nested list item --- e4078c3d04bf83845b7f7d4f073685ddd934461c diff --cc Documentation/config/extensions.adoc index 829f2523fc,49a7598ca5..556eda5d12 --- a/Documentation/config/extensions.adoc +++ b/Documentation/config/extensions.adoc @@@ -14,12 -13,8 +13,12 @@@ compatObjectFormat:: compatObjectFormat. As well as being able to use oids encoded in compatObjectFormat in addition to oids encoded with objectFormat to locally specify objects. ++ +Note that the functionality enabled by this extension is incomplete and subject +to change. It currently exists only to allow development and testing of +the underlying feature and is not designed to be enabled by end users. - noop:: + noop::: This extension does not change git's behavior at all. It is useful only for testing format-1 compatibility. + diff --cc Documentation/pretty-formats.adoc index 618ddc4a0c,3d7a8885b6..2121e8e1df --- a/Documentation/pretty-formats.adoc +++ b/Documentation/pretty-formats.adoc @@@ -232,8 -232,8 +232,8 @@@ ref names with custom decorations. The colon and zero or more comma-separated options. Option values may contain literal formatting codes. These must be used for commas (`%x2C`) and closing parentheses (`%x29`), due to their role in the option syntax. - + + -** `prefix=`: Shown before the list of ref names. Defaults to "{nbsp}+(+". +** `prefix=`: Shown before the list of ref names. Defaults to "{nbsp}++(++". ** `suffix=`: Shown after the list of ref names. Defaults to "+)+". ** `separator=`: Shown between ref names. Defaults to "+,+{nbsp}". ** `pointer=`: Shown between HEAD and the branch it points to, if any.